Changeset 34


Ignore:
Timestamp:
05/01/07 12:44:34 (8 years ago)
Author:
guyru
Message:

more fixes for icon issue

Location:
trunk/OpenYahtzee
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/OpenYahtzee/TODO

    r2 r34  
     1TODO FILE 
     2-cleanup code at the end of every scoring button 
     3-cleanup code for the icon settings for the dialogs/frames 
  • trunk/OpenYahtzee/openyahtzee.kdevelop

    r33 r34  
    223223    <custom>false</custom> 
    224224    <bzip>false</bzip> 
    225     <archname/> 
     225    <archname></archname> 
    226226    <appname>OpenYahtzee</appname> 
    227227    <version>1.6</version> 
    228     <release/> 
     228    <release></release> 
    229229    <vendor>Guy Rutenberg</vendor> 
    230230    <licence>GPL</licence> 
    231     <summary/> 
    232     <group/> 
    233     <packager/> 
    234     <description/> 
    235     <changelog/> 
     231    <summary></summary> 
     232    <group></group> 
     233    <packager></packager> 
     234    <description></description> 
     235    <changelog></changelog> 
    236236    <devpackage>false</devpackage> 
    237237    <docspackage>false</docspackage> 
     
    242242    <ftpkde>false</ftpkde> 
    243243    <appskde>false</appskde> 
    244     <url/> 
     244    <url></url> 
    245245  </dist> 
    246246</kdevelop> 
  • trunk/OpenYahtzee/openyahtzee.kdevses

    r33 r34  
    22<!DOCTYPE KDevPrjSession> 
    33<KDevPrjSession> 
    4  <DocsAndViews NumberOfDocuments="11" > 
     4 <DocsAndViews NumberOfDocuments="13" > 
    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 Type="Source" /> 
     9   <View0 line="0" Type="Source" /> 
    1010  </Doc1> 
    1111  <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.cpp" > 
    12    <View0 Type="Source" /> 
     12   <View0 line="62" 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 Type="Source" /> 
     18   <View0 line="0" Type="Source" /> 
    1919  </Doc4> 
    2020  <Doc5 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.h" > 
     
    2222  </Doc5> 
    2323  <Doc6 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreTableDB.cpp" > 
    24    <View0 Type="Source" /> 
     24   <View0 line="0" Type="Source" /> 
    2525  </Doc6> 
    2626  <Doc7 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDialog.cpp" > 
    27    <View0 Type="Source" /> 
     27   <View0 line="52" Type="Source" /> 
    2828  </Doc7> 
    2929  <Doc8 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.cpp" > 
    30    <View0 Type="Source" /> 
     30   <View0 line="0" 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="116" Type="Source" /> 
     36   <View0 line="40" Type="Source" /> 
    3737  </Doc10> 
     38  <Doc11 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.cpp" > 
     39   <View0 line="0" Type="Source" /> 
     40  </Doc11> 
     41  <Doc12 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreDialog.h" > 
     42   <View0 line="0" Type="Source" /> 
     43  </Doc12> 
    3844 </DocsAndViews> 
    3945 <pluginList> 
  • trunk/OpenYahtzee/src/HighScoreDialog.cpp

    r32 r34  
    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 
    3036using namespace std; 
    3137 
     
    3339        wxDialog(parent, id, wxT("High-Score Table"), wxDefaultPosition, wxDefaultSize,wxCLOSE_BOX | wxCAPTION) 
    3440{ 
     41        //set the icon 
     42#ifdef WIN32 
     43        SetIcon(wxIcon(icon32_xpm)); 
     44#else 
     45        SetIcon(wxIcon(icon_xpm)); 
     46#endif 
     47 
    3548        list<string> table; 
    3649 
  • trunk/OpenYahtzee/src/SettingsDialog.cpp

    r24 r34  
    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 
    2733 
    2834 
     
    3036    wxDialog(parent, wxID_ANY, wxT("Settins Dialog"), wxDefaultPosition, wxDefaultSize, wxCLOSE_BOX | wxCAPTION) 
    3137{ 
    32     // begin wxGlade: SettingsDialog::SettingsDialog 
    33     label_1 = new wxStaticText(this, -1, wxT("High-score table size:")); 
    34     spin_ctrl = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS,0,1024,20); 
    35     button_3 = new wxToggleButton(this, ID_RESETHIGHSCORE, wxT("reset high-score table")); 
    36     button_1 = new wxButton(this, wxID_OK); 
    37     button_2 = new wxButton(this, wxID_CANCEL); 
     38                //set the icon 
     39#ifdef WIN32 
     40        SetIcon(wxIcon(icon32_xpm)); 
     41#else 
     42        SetIcon(wxIcon(icon_xpm)); 
     43#endif 
     44        // begin wxGlade: SettingsDialog::SettingsDialog 
     45        label_1 = new wxStaticText(this, -1, wxT("High-score table size:")); 
     46        spin_ctrl = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS,0,1024,20); 
     47        button_3 = new wxToggleButton(this, ID_RESETHIGHSCORE, wxT("reset high-score table")); 
     48        button_1 = new wxButton(this, wxID_OK); 
     49        button_2 = new wxButton(this, wxID_CANCEL); 
    3850 
    39     set_properties(); 
    40     do_layout(); 
    41     // end wxGlade 
     51        set_properties(); 
     52        do_layout(); 
     53        // end wxGlade 
    4254} 
    4355 
Note: See TracChangeset for help on using the changeset viewer.