Changeset 33

Timestamp:

05/01/07 12:11:39 (6 years ago)

Author:

guyru

Message:

fixed icon issue under windows

Location:

trunk/OpenYahtzee

Files:

• openyahtzee.kdevelop (modified) (8 diffs)
• openyahtzee.kdevelop.pcs (modified) (previous)
• openyahtzee.kdevses (modified) (2 diffs)
• src/MainFrame.cpp (modified) (3 diffs)
• src/Makefile.am (modified) (1 diff)
• src/Makefile.in (modified) (1 diff)
• src/icon32.xpm (added)

trunk/OpenYahtzee/openyahtzee.kdevelop

@@ -14 +14 @@
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description></description>
-    <versioncontrol></versioncontrol>
+    <description/>
+    <versioncontrol/>
   </general>
   <kdevautoproject>
@@ -30 +30 @@
       </runarguments>
       <customdirectory>/</customdirectory>
-      <programargs></programargs>
+      <programargs/>
       <autocompile>true</autocompile>
       <envvars/>
@@ -79 +79 @@
       <numberofjobs>1</numberofjobs>
       <dontact>false</dontact>
-      <makebin></makebin>
+      <makebin/>
       <prio>0</prio>
     </make>
@@ -152 +152 @@
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>openyahtzee.tag</docurl>
-      <usermanualurl></usermanualurl>
+      <usermanualurl/>
     </projectdoc>
   </kdevdocumentation>
@@ -188 +188 @@
     </codecompletion>
     <creategettersetter>
-      <prefixGet></prefixGet>
+      <prefixGet/>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
@@ -204 +204 @@
   <kdevdebugger>
     <general>
-      <programargs></programargs>
-      <gdbpath></gdbpath>
-      <dbgshell></dbgshell>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
+      <programargs/>
+      <gdbpath/>
+      <dbgshell/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
@@ -223 +223 @@
     <custom>false</custom>
     <bzip>false</bzip>
-    <archname></archname>
+    <archname/>
     <appname>OpenYahtzee</appname>
     <version>1.6</version>
-    <release></release>
+    <release/>
     <vendor>Guy Rutenberg</vendor>
     <licence>GPL</licence>
-    <summary></summary>
-    <group></group>
-    <packager></packager>
-    <description></description>
-    <changelog></changelog>
+    <summary/>
+    <group/>
+    <packager/>
+    <description/>
+    <changelog/>
     <devpackage>false</devpackage>
     <docspackage>false</docspackage>
@@ -242 +242 @@
     <ftpkde>false</ftpkde>
     <appskde>false</appskde>
-    <url></url>
+    <url/>
   </dist>
 </kdevelop>

trunk/OpenYahtzee/openyahtzee.kdevses

@@ -10 +10 @@
   </Doc1>
   <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.cpp" >
-   <View0 line="60" Type="Source" />
+   <View0 Type="Source" />
   </Doc2>
   <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/ObjectsID.h" >
@@ -22 +22 @@
   </Doc5>
   <Doc6 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreTableDB.cpp" >
-   <View0 line="0" Type="Source" />
+   <View0 Type="Source" />
   </Doc6>
   <Doc7 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDialog.cpp" >

trunk/OpenYahtzee/src/MainFrame.cpp

@@ -47 +47 @@
 
 //include the icon file
-#include "icon.xpm"
-
+#ifdef WIN32
+        #include "icon32.xpm"
+#else
+        #include "icon.xpm"
+#endif
 
 //default values
@@ -58 +61 @@
 {
         //give the frame an icon
-        //SetIcon(wxIcon(icon_xpm));
+#ifdef WIN32
+        SetIcon(wxIcon(icon32_xpm));
+#else
         SetIcon(wxIcon(icon_xpm));
+#endif
+
         std::ostringstream sstr;
 
@@ -249 +256 @@
         wxString msg;
         wxString sqliteversion = wxString(sqlite3_version,wxConvUTF8);
-        msg.Printf(wxT("OpenYahtzee 1.5.1\nCopyright (C) 2006 by Guy Rutenberg\n\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nOpenYahtzee was built against:\nwxWidgets %i.%i\n"),wxMAJOR_VERSION,wxMINOR_VERSION);
+        msg.Printf(wxT("OpenYahtzee 1.6\nCopyright (C) 2006 by Guy Rutenberg\n\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nOpenYahtzee was built against:\nwxWidgets %i.%i\n"),wxMAJOR_VERSION,wxMINOR_VERSION);
         msg += wxT("SQLite ") + sqliteversion;
                 

trunk/OpenYahtzee/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = openyahtzee
 openyahtzee_SOURCES = openyahtzee.cpp MainFrame.cpp five.xpm four.xpm one.xpm \
-                six.xpm three.xpm two.xpm DBwrapper.cpp DBwrapper.h SettingsDB.cpp \
-                HighScoreTableDB.cpp HighScoreDialog.cpp SettingsDialog.cpp icon.xpm
+                        six.xpm three.xpm two.xpm DBwrapper.cpp DBwrapper.h SettingsDB.cpp \
+                        HighScoreTableDB.cpp HighScoreDialog.cpp SettingsDialog.cpp icon.xpm icon32.xpm
 
 # set the include path found by configure

trunk/OpenYahtzee/src/Makefile.in

@@ -185 +185 @@
 target_alias = @target_alias@
 openyahtzee_SOURCES = openyahtzee.cpp MainFrame.cpp five.xpm four.xpm one.xpm \
-                six.xpm three.xpm two.xpm DBwrapper.cpp DBwrapper.h SettingsDB.cpp \
-                HighScoreTableDB.cpp HighScoreDialog.cpp SettingsDialog.cpp icon.xpm
+                        six.xpm three.xpm two.xpm DBwrapper.cpp DBwrapper.h SettingsDB.cpp \
+                        HighScoreTableDB.cpp HighScoreDialog.cpp SettingsDialog.cpp icon.xpm icon32.xpm