[grisbi-cvs] [SCM] grisbi branch, master, updated. 2f6d8022481b539c318c866c214d08cb2ad71d2b
Gunee
nobody at users.sourceforge.net
Mon Aug 9 22:04:31 CEST 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".
The branch, master has been updated
via 2f6d8022481b539c318c866c214d08cb2ad71d2b (commit)
via 9d84a2b1fa9a1a43100324853355f0dbbc2d7939 (commit)
via a717d546e13261a0de653b31c8ac7f6817e132bc (commit)
from f24c62ed2c08c8661254313c4f505ca6f0399348 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2f6d8022481b539c318c866c214d08cb2ad71d2b
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date: Mon Aug 2 22:51:22 2010 +0200
old files not compiled anymore
commit 9d84a2b1fa9a1a43100324853355f0dbbc2d7939
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date: Tue Jun 22 12:25:43 2010 +0200
Windows: Better resources (Icon, Native version number, etc...)
commit a717d546e13261a0de653b31c8ac7f6817e132bc
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date: Sat Jun 19 22:06:33 2010 +0200
Fixed the file association on Windows
-----------------------------------------------------------------------
Changes:
diff --git a/win32-msvc/CMakeLists.txt b/win32-msvc/CMakeLists.txt
index 9266926..3e37ca0 100644
--- a/win32-msvc/CMakeLists.txt
+++ b/win32-msvc/CMakeLists.txt
@@ -96,8 +96,8 @@ SET (grisbi_source
../src/affichage.h
../src/affichage_liste.c
../src/affichage_liste.h
- ../src/balance_estimate_tab.c
- ../src/balance_estimate_tab.h
+# ../src/balance_estimate_tab.c
+# ../src/balance_estimate_tab.h
../src/barre_outils.c
../src/barre_outils.h
../src/categories_onglet.c
@@ -372,7 +372,7 @@ SET (grisbi_source
../win32/win32gtkutils.h
../win32/win32utils.c
../win32/win32utils.h
- ../win32/grisbi.ico
+ # ../win32/grisbi.ico
)
ADD_EXECUTABLE(grisbi
diff --git a/win32-msvc/src/.gitignore b/win32-msvc/src/.gitignore
new file mode 100644
index 0000000..168411c
--- /dev/null
+++ b/win32-msvc/src/.gitignore
@@ -0,0 +1,2 @@
+*.aps
+
diff --git a/win32-msvc/src/grisbi.rc b/win32-msvc/src/grisbi.rc
index 320ece2..0afd34a 100644
--- a/win32-msvc/src/grisbi.rc
+++ b/win32-msvc/src/grisbi.rc
@@ -1,122 +1,44 @@
-//Script de ressources généré par Microsoft Visual C++.
+// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
-// Généré à partir de la ressource TEXTINCLUDE 2.
+// Generated from the TEXTINCLUDE 2 resource.
//
-#ifndef APSTUDIO_INVOKED
-//#include "targetver.h"
-#endif
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-LANGUAGE 12, 1
-#pragma code_page(1252)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icône
-//
-
-// L'icône avec la valeur d'ID la plus basse est placée en premier afin que l'icône d'application
-// soit cohérente sur tous les systèmes.
-
-IDI_TESTUI ICON "grisbi.ico"
-IDI_SMALL ICON "grisbi.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDC_TESTUI MENU
-BEGIN
- POPUP "&Fichier"
- BEGIN
- MENUITEM "&Quitter", IDM_EXIT
- END
- POPUP "&?"
- BEGIN
- MENUITEM "&À propos de ...", IDM_ABOUT
- END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accélérateur
-//
-
-IDC_TESTUI ACCELERATORS
-BEGIN
- "?", IDM_ABOUT, ASCII, ALT
- "/", IDM_ABOUT, ASCII, ALT
-END
-
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
-//
-// Boîte de dialogue
-//
-
-IDD_ABOUTBOX DIALOGEX 0, 0, 170, 62
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "À propos de testui"
-FONT 8, "MS Shell Dlg"
-BEGIN
- ICON IDR_MAINFRAME,IDC_STATIC,14,14,21,20
- LTEXT "testui, Version 1.0",IDC_STATIC,42,14,114,8,SS_NOPREFIX
- LTEXT "Copyright (C) 2009",IDC_STATIC,42,26,114,8
- DEFPUSHBUTTON "OK",IDOK,113,41,50,14,WS_GROUP
-END
+#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
+// Français (France) resources
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
- IDD_ABOUTBOX, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 163
- TOPMARGIN, 7
- BOTTOMMARGIN, 55
- END
-END
-#endif // APSTUDIO_INVOKED
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+#ifdef _WIN32
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+#pragma code_page(1252)
+#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
- "#ifndef APSTUDIO_INVOKED\r\n"
- "#include ""targetver.h""\r\n"
- "#endif\r\n"
- "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
- "#include ""windows.h""\r\n"
- "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+ "#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -124,18 +46,55 @@ END
#endif // APSTUDIO_INVOKED
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1 ICON "..\\win32\\grisbi.ico"
+
/////////////////////////////////////////////////////////////////////////////
//
-// Table de chaînes
+// Version
//
-STRINGTABLE
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,6,0,0
+ PRODUCTVERSION 0,6,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
BEGIN
- IDC_TESTUI "GRISBI"
- IDS_APP_TITLE "Grisbi"
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "000004b0"
+ BEGIN
+ VALUE "CompanyName", "The Grisbi Team"
+ VALUE "FileDescription", "Grisbi"
+ VALUE "FileVersion", "0, 6, 0, 0"
+ VALUE "InternalName", "grisbi"
+ VALUE "LegalCopyright", "Copyleft (C) 2003-2010"
+ VALUE "OriginalFilename", "grisbi.rc"
+ VALUE "ProductName", "Grisbi"
+ VALUE "ProductVersion", "0, 6, 0, 0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0, 1200
+ END
END
-#endif
+#endif // Français (France) resources
/////////////////////////////////////////////////////////////////////////////
@@ -143,8 +102,10 @@ END
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
-// Généré à partir de la ressource TEXTINCLUDE 3.
+// Generated from the TEXTINCLUDE 3 resource.
//
+
/////////////////////////////////////////////////////////////////////////////
-#endif // non APSTUDIO_INVOKED
+#endif // not APSTUDIO_INVOKED
+
diff --git a/win32-msvc/src/resource.h b/win32-msvc/src/resource.h
index e45df3f..9956a1a 100644
--- a/win32-msvc/src/resource.h
+++ b/win32-msvc/src/resource.h
@@ -1,31 +1,16 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
-// Used by testui.rc
+// Used by grisbi.rc
//
+#define IDI_ICON1 104
-#define IDS_APP_TITLE 103
-
-#define IDR_MAINFRAME 128
-#define IDD_TESTUI_DIALOG 102
-#define IDD_ABOUTBOX 103
-#define IDM_ABOUT 104
-#define IDM_EXIT 105
-#define IDI_TESTUI 107
-#define IDI_SMALL 108
-#define IDC_TESTUI 109
-#define IDC_MYICON 2
-#ifndef IDC_STATIC
-#define IDC_STATIC -1
-#endif
-// Valeurs par défaut suivantes des nouveaux objets
-//
+// Next default values for new objects
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-
-#define _APS_NO_MFC 130
-#define _APS_NEXT_RESOURCE_VALUE 129
-#define _APS_NEXT_COMMAND_VALUE 32771
-#define _APS_NEXT_CONTROL_VALUE 1000
-#define _APS_NEXT_SYMED_VALUE 110
+#define _APS_NEXT_RESOURCE_VALUE 105
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
diff --git a/win32-msvc/windows_installer.nsi b/win32-msvc/windows_installer.nsi
index b10699b..e6af5c7 100644
--- a/win32-msvc/windows_installer.nsi
+++ b/win32-msvc/windows_installer.nsi
@@ -146,7 +146,7 @@ Section $(ProgFiles)
; File extension keys
WriteRegStr HKCR ".gsb" "" "gsb_account_file"
- WriteRegExpandStr HKCR "gsb_account_file\Shell\open\command" "" "$INSTDIR\grisbi.exe"
+ WriteRegExpandStr HKCR "gsb_account_file\Shell\open\command" "" "$INSTDIR\grisbi.exe %1"
WriteRegExpandStr HKCR "gsb_account_file\DefaultIcon" "" "$INSTDIR\grisbi.ico"
;Create uninstaller
diff --git a/win32/grisbi.ico b/win32/grisbi.ico
index 561274f..37bddce 100644
Binary files a/win32/grisbi.ico and b/win32/grisbi.ico differ
hooks/post-receive
--
grisbi
More information about the cvs
mailing list