Changeset 35

Timestamp:

05/01/07 23:03:00 (6 years ago)

Author:

guyru

Message:

new icon handling

Location:

trunk/OpenYahtzee

Files:

• Makefile.in (modified) (5 diffs)
• openyahtzee.kdevelop.pcs (modified) (previous)
• openyahtzee.kdevses (modified) (3 diffs)
• src/HighScoreDialog.cpp (modified) (1 diff)
• src/Icon.h (added)
• src/Makefile.am (modified) (1 diff)
• src/Makefile.in (modified) (1 diff)
• src/SettingsDialog.cpp (modified) (1 diff)

trunk/OpenYahtzee/Makefile.in

@@ -102 +102 @@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -126 +127 @@
 STRIP = @STRIP@
 VERSION = @VERSION@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -148 +146 @@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
@@ -154 +155 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -159 +161 @@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@

trunk/OpenYahtzee/openyahtzee.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="13" >
+ <DocsAndViews NumberOfDocuments="12" >
   <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 line="0" Type="Source" />
+   <View0 Type="Source" />
   </Doc1>
   <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.cpp" >
-   <View0 line="62" Type="Source" />
+   <View0 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 line="0" Type="Source" />
+   <View0 Type="Source" />
   </Doc4>
   <Doc5 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.h" >
-   <View0 Type="Source" />
+   <View0 line="20" Type="Source" />
   </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" >
-   <View0 line="52" Type="Source" />
+   <View0 line="27" Type="Source" />
   </Doc7>
   <Doc8 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.cpp" >
-   <View0 line="0" Type="Source" />
+   <View0 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="40" Type="Source" />
+   <View0 line="30" Type="Source" />
   </Doc10>
-  <Doc11 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.cpp" >
-   <View0 line="0" Type="Source" />
+  <Doc11 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/Icon.h" >
+   <View0 line="32" 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
+
+#include "Icon.h"
+
 using namespace std;
 
 HighScoreDialog::HighScoreDialog(wxWindow* parent,wxWindowID id,HighScoreTableDB *highscoredb) :
-        wxDialog(parent, id, wxT("High-Score Table"), wxDefaultPosition, wxDefaultSize,wxCLOSE_BOX | wxCAPTION)
+        wxDialog(parent, id, wxT("High-Score Table"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
-        //set the icon
-#ifdef WIN32
-        SetIcon(wxIcon(icon32_xpm));
-#else
-        SetIcon(wxIcon(icon_xpm));
-#endif
+
+        SetIcon(wxIcon(ICON));
+
 
         list<string> table;

trunk/OpenYahtzee/src/Makefile.am

@@ -10 +10 @@
 
 noinst_HEADERS = MainFrame.h ObjectsID.h SettingsDB.h HighScoreTableDB.h \
-                HighScoreDialog.h SettingsDialog.h
+                        HighScoreDialog.h SettingsDialog.h Icon.h
 
 openyahtzee_LDFLAGS = `wx-config --libs` -lsqlite3

trunk/OpenYahtzee/src/Makefile.in

@@ -194 +194 @@
 # the library search path.
 noinst_HEADERS = MainFrame.h ObjectsID.h SettingsDB.h HighScoreTableDB.h \
-                HighScoreDialog.h SettingsDialog.h
+                        HighScoreDialog.h SettingsDialog.h Icon.h
 
 openyahtzee_LDFLAGS = `wx-config --libs` -lsqlite3

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
 
+#include "Icon.h"
 
 SettingsDialog::SettingsDialog(wxWindow* parent, int id):
-    wxDialog(parent, wxID_ANY, wxT("Settins Dialog"), wxDefaultPosition, wxDefaultSize, wxCLOSE_BOX | wxCAPTION)
+    wxDialog(parent, wxID_ANY, wxT("Settins Dialog"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
-                //set the icon
-#ifdef WIN32
-        SetIcon(wxIcon(icon32_xpm));
-#else
-        SetIcon(wxIcon(icon_xpm));
-#endif
+
+        SetIcon(wxIcon(ICON));
+
         // begin wxGlade: SettingsDialog::SettingsDialog
         label_1 = new wxStaticText(this, -1, wxT("High-score table size:"));