Changeset 35


Ignore:
Timestamp:
05/01/07 23:03:00 (7 years ago)
Author:
guyru
Message:

new icon handling

Location:
trunk/OpenYahtzee
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/OpenYahtzee/Makefile.in

    r2 r35  
    102102F77 = @F77@ 
    103103FFLAGS = @FFLAGS@ 
     104GREP = @GREP@ 
    104105INSTALL_DATA = @INSTALL_DATA@ 
    105106INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
     
    126127STRIP = @STRIP@ 
    127128VERSION = @VERSION@ 
    128 ac_ct_AR = @ac_ct_AR@ 
    129129ac_ct_CC = @ac_ct_CC@ 
    130130ac_ct_CXX = @ac_ct_CXX@ 
    131131ac_ct_F77 = @ac_ct_F77@ 
    132 ac_ct_RANLIB = @ac_ct_RANLIB@ 
    133 ac_ct_STRIP = @ac_ct_STRIP@ 
    134132am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ 
    135133am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ 
     
    148146build_vendor = @build_vendor@ 
    149147datadir = @datadir@ 
     148datarootdir = @datarootdir@ 
     149docdir = @docdir@ 
     150dvidir = @dvidir@ 
    150151exec_prefix = @exec_prefix@ 
    151152host = @host@ 
     
    154155host_os = @host_os@ 
    155156host_vendor = @host_vendor@ 
     157htmldir = @htmldir@ 
    156158includedir = @includedir@ 
    157159infodir = @infodir@ 
     
    159161libdir = @libdir@ 
    160162libexecdir = @libexecdir@ 
     163localedir = @localedir@ 
    161164localstatedir = @localstatedir@ 
    162165mandir = @mandir@ 
    163166mkdir_p = @mkdir_p@ 
    164167oldincludedir = @oldincludedir@ 
     168pdfdir = @pdfdir@ 
    165169prefix = @prefix@ 
    166170program_transform_name = @program_transform_name@ 
     171psdir = @psdir@ 
    167172sbindir = @sbindir@ 
    168173sharedstatedir = @sharedstatedir@ 
  • trunk/OpenYahtzee/openyahtzee.kdevses

    r34 r35  
    22<!DOCTYPE KDevPrjSession> 
    33<KDevPrjSession> 
    4  <DocsAndViews NumberOfDocuments="13" > 
     4 <DocsAndViews NumberOfDocuments="12" > 
    55  <Doc0 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.h" > 
    66   <View0 Type="Source" /> 
    77  </Doc0> 
    88  <Doc1 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/openyahtzee.cpp" > 
    9    <View0 line="0" Type="Source" /> 
     9   <View0 Type="Source" /> 
    1010  </Doc1> 
    1111  <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.cpp" > 
    12    <View0 line="62" Type="Source" /> 
     12   <View0 Type="Source" /> 
    1313  </Doc2> 
    1414  <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/ObjectsID.h" > 
     
    1616  </Doc3> 
    1717  <Doc4 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.h" > 
    18    <View0 line="0" Type="Source" /> 
     18   <View0 Type="Source" /> 
    1919  </Doc4> 
    2020  <Doc5 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.h" > 
    21    <View0 Type="Source" /> 
     21   <View0 line="20" Type="Source" /> 
    2222  </Doc5> 
    2323  <Doc6 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreTableDB.cpp" > 
    24    <View0 line="0" Type="Source" /> 
     24   <View0 Type="Source" /> 
    2525  </Doc6> 
    2626  <Doc7 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDialog.cpp" > 
    27    <View0 line="52" Type="Source" /> 
     27   <View0 line="27" Type="Source" /> 
    2828  </Doc7> 
    2929  <Doc8 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.cpp" > 
    30    <View0 line="0" Type="Source" /> 
     30   <View0 Type="Source" /> 
    3131  </Doc8> 
    3232  <Doc9 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreTableDB.h" > 
     
    3434  </Doc9> 
    3535  <Doc10 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreDialog.cpp" > 
    36    <View0 line="40" Type="Source" /> 
     36   <View0 line="30" Type="Source" /> 
    3737  </Doc10> 
    38   <Doc11 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.cpp" > 
    39    <View0 line="0" Type="Source" /> 
     38  <Doc11 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/Icon.h" > 
     39   <View0 line="32" Type="Source" /> 
    4040  </Doc11> 
    41   <Doc12 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreDialog.h" > 
    42    <View0 line="0" Type="Source" /> 
    43   </Doc12> 
    4441 </DocsAndViews> 
    4542 <pluginList> 
  • trunk/OpenYahtzee/src/HighScoreDialog.cpp

    r34 r35  
    2828#include "ObjectsID.h" 
    2929#include "HighScoreDialog.h" 
    30 //include the icon file 
    31 #ifdef WIN32 
    32         #include "icon32.xpm" 
    33 #else 
    34         #include "icon.xpm" 
    35 #endif 
     30 
     31#include "Icon.h" 
     32 
    3633using namespace std; 
    3734 
    3835HighScoreDialog::HighScoreDialog(wxWindow* parent,wxWindowID id,HighScoreTableDB *highscoredb) : 
    39         wxDialog(parent, id, wxT("High-Score Table"), wxDefaultPosition, wxDefaultSize,wxCLOSE_BOX | wxCAPTION) 
     36        wxDialog(parent, id, wxT("High-Score Table"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) 
    4037{ 
    41         //set the icon 
    42 #ifdef WIN32 
    43         SetIcon(wxIcon(icon32_xpm)); 
    44 #else 
    45         SetIcon(wxIcon(icon_xpm)); 
    46 #endif 
     38 
     39        SetIcon(wxIcon(ICON)); 
     40 
    4741 
    4842        list<string> table; 
  • trunk/OpenYahtzee/src/Makefile.am

    r33 r35  
    1010 
    1111noinst_HEADERS = MainFrame.h ObjectsID.h SettingsDB.h HighScoreTableDB.h \ 
    12                 HighScoreDialog.h SettingsDialog.h 
     12                        HighScoreDialog.h SettingsDialog.h Icon.h 
    1313 
    1414openyahtzee_LDFLAGS = `wx-config --libs` -lsqlite3 
  • trunk/OpenYahtzee/src/Makefile.in

    r33 r35  
    194194# the library search path. 
    195195noinst_HEADERS = MainFrame.h ObjectsID.h SettingsDB.h HighScoreTableDB.h \ 
    196                 HighScoreDialog.h SettingsDialog.h 
     196                        HighScoreDialog.h SettingsDialog.h Icon.h 
    197197 
    198198openyahtzee_LDFLAGS = `wx-config --libs` -lsqlite3 
  • trunk/OpenYahtzee/src/SettingsDialog.cpp

    r34 r35  
    2525#include "SettingsDialog.h" 
    2626#include "MainFrame.h" 
    27 //include the icon file 
    28 #ifdef WIN32 
    29         #include "icon32.xpm" 
    30 #else 
    31         #include "icon.xpm" 
    32 #endif 
    3327 
     28#include "Icon.h" 
    3429 
    3530SettingsDialog::SettingsDialog(wxWindow* parent, int id): 
    36     wxDialog(parent, wxID_ANY, wxT("Settins Dialog"), wxDefaultPosition, wxDefaultSize, wxCLOSE_BOX | wxCAPTION) 
     31    wxDialog(parent, wxID_ANY, wxT("Settins Dialog"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) 
    3732{ 
    38                 //set the icon 
    39 #ifdef WIN32 
    40         SetIcon(wxIcon(icon32_xpm)); 
    41 #else 
    42         SetIcon(wxIcon(icon_xpm)); 
    43 #endif 
     33 
     34        SetIcon(wxIcon(ICON)); 
     35 
    4436        // begin wxGlade: SettingsDialog::SettingsDialog 
    4537        label_1 = new wxStaticText(this, -1, wxT("High-score table size:")); 
Note: See TracChangeset for help on using the changeset viewer.