Changeset 34

Timestamp:

05/01/07 12:44:34 (6 years ago)

Author:

guyru

Message:

more fixes for icon issue

Location:

trunk/OpenYahtzee

Files:

• TODO (modified) (1 diff)
• openyahtzee.kdevelop (modified) (2 diffs)
• openyahtzee.kdevelop.pcs (modified) (previous)
• openyahtzee.kdevses (modified) (4 diffs)
• src/HighScoreDialog.cpp (modified) (2 diffs)
• src/SettingsDialog.cpp (modified) (2 diffs)

trunk/OpenYahtzee/TODO

@@ +1 @@
+TODO FILE
+-cleanup code at the end of every scoring button
+-cleanup code for the icon settings for the dialogs/frames

trunk/OpenYahtzee/openyahtzee.kdevelop

@@ -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/>
-    <group/>
-    <packager/>
-    <description/>
-    <changelog/>
+    <summary></summary>
+    <group></group>
+    <packager></packager>
+    <description></description>
+    <changelog></changelog>
     <devpackage>false</devpackage>
     <docspackage>false</docspackage>
@@ -242 +242 @@
     <ftpkde>false</ftpkde>
     <appskde>false</appskde>
-    <url/>
+    <url></url>
   </dist>
 </kdevelop>

trunk/OpenYahtzee/openyahtzee.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="11" >
+ <DocsAndViews NumberOfDocuments="13" >
   <Doc0 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.h" >
    <View0 Type="Source" />
   </Doc0>
   <Doc1 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/openyahtzee.cpp" >
-   <View0 Type="Source" />
+   <View0 line="0" Type="Source" />
   </Doc1>
   <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.cpp" >
-   <View0 Type="Source" />
+   <View0 line="62" Type="Source" />
   </Doc2>
   <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/ObjectsID.h" >
@@ -16 +16 @@
   </Doc3>
   <Doc4 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.h" >
-   <View0 Type="Source" />
+   <View0 line="0" Type="Source" />
   </Doc4>
   <Doc5 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.h" >
@@ -22 +22 @@
   </Doc5>
   <Doc6 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreTableDB.cpp" >
-   <View0 Type="Source" />
+   <View0 line="0" Type="Source" />
   </Doc6>
   <Doc7 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDialog.cpp" >
-   <View0 Type="Source" />
+   <View0 line="52" Type="Source" />
   </Doc7>
   <Doc8 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.cpp" >
-   <View0 Type="Source" />
+   <View0 line="0" Type="Source" />
   </Doc8>
   <Doc9 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreTableDB.h" >
@@ -34 +34 @@
   </Doc9>
   <Doc10 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreDialog.cpp" >
-   <View0 line="116" Type="Source" />
+   <View0 line="40" Type="Source" />
   </Doc10>
+  <Doc11 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.cpp" >
+   <View0 line="0" Type="Source" />
+  </Doc11>
+  <Doc12 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreDialog.h" >
+   <View0 line="0" Type="Source" />
+  </Doc12>
  </DocsAndViews>
  <pluginList>

trunk/OpenYahtzee/src/HighScoreDialog.cpp

@@ -28 +28 @@
 #include "ObjectsID.h"
 #include "HighScoreDialog.h"
+//include the icon file
+#ifdef WIN32
+        #include "icon32.xpm"
+#else
+        #include "icon.xpm"
+#endif
 using namespace std;
 
@@ -33 +39 @@
         wxDialog(parent, id, wxT("High-Score Table"), wxDefaultPosition, wxDefaultSize,wxCLOSE_BOX | wxCAPTION)
 {
+        //set the icon
+#ifdef WIN32
+        SetIcon(wxIcon(icon32_xpm));
+#else
+        SetIcon(wxIcon(icon_xpm));
+#endif
+
         list<string> table;
 

trunk/OpenYahtzee/src/SettingsDialog.cpp

@@ -25 +25 @@
 #include "SettingsDialog.h"
 #include "MainFrame.h"
+//include the icon file
+#ifdef WIN32
+        #include "icon32.xpm"
+#else
+        #include "icon.xpm"
+#endif
 
 
@@ -30 +36 @@
     wxDialog(parent, wxID_ANY, wxT("Settins Dialog"), wxDefaultPosition, wxDefaultSize, wxCLOSE_BOX | wxCAPTION)
 {
-    // begin wxGlade: SettingsDialog::SettingsDialog
-    label_1 = new wxStaticText(this, -1, wxT("High-score table size:"));
-    spin_ctrl = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS,0,1024,20);
-    button_3 = new wxToggleButton(this, ID_RESETHIGHSCORE, wxT("reset high-score table"));
-    button_1 = new wxButton(this, wxID_OK);
-    button_2 = new wxButton(this, wxID_CANCEL);
+                //set the icon
+#ifdef WIN32
+        SetIcon(wxIcon(icon32_xpm));
+#else
+        SetIcon(wxIcon(icon_xpm));
+#endif
+        // begin wxGlade: SettingsDialog::SettingsDialog
+        label_1 = new wxStaticText(this, -1, wxT("High-score table size:"));
+        spin_ctrl = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS,0,1024,20);
+        button_3 = new wxToggleButton(this, ID_RESETHIGHSCORE, wxT("reset high-score table"));
+        button_1 = new wxButton(this, wxID_OK);
+        button_2 = new wxButton(this, wxID_CANCEL);
 
-    set_properties();
-    do_layout();
-    // end wxGlade
+        set_properties();
+        do_layout();
+        // end wxGlade
 }