Changeset 33


Ignore:
Timestamp:
05/01/07 12:11:39 (7 years ago)
Author:
guyru
Message:

fixed icon issue under windows

Location:
trunk/OpenYahtzee
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/OpenYahtzee/openyahtzee.kdevelop

    r32 r33  
    1414    <projectdirectory>.</projectdirectory> 
    1515    <absoluteprojectpath>false</absoluteprojectpath> 
    16     <description></description> 
    17     <versioncontrol></versioncontrol> 
     16    <description/> 
     17    <versioncontrol/> 
    1818  </general> 
    1919  <kdevautoproject> 
     
    3030      </runarguments> 
    3131      <customdirectory>/</customdirectory> 
    32       <programargs></programargs> 
     32      <programargs/> 
    3333      <autocompile>true</autocompile> 
    3434      <envvars/> 
     
    7979      <numberofjobs>1</numberofjobs> 
    8080      <dontact>false</dontact> 
    81       <makebin></makebin> 
     81      <makebin/> 
    8282      <prio>0</prio> 
    8383    </make> 
     
    152152      <docsystem>Doxygen Documentation Collection</docsystem> 
    153153      <docurl>openyahtzee.tag</docurl> 
    154       <usermanualurl></usermanualurl> 
     154      <usermanualurl/> 
    155155    </projectdoc> 
    156156  </kdevdocumentation> 
     
    188188    </codecompletion> 
    189189    <creategettersetter> 
    190       <prefixGet></prefixGet> 
     190      <prefixGet/> 
    191191      <prefixSet>set</prefixSet> 
    192192      <prefixVariable>m_,_</prefixVariable> 
     
    204204  <kdevdebugger> 
    205205    <general> 
    206       <programargs></programargs> 
    207       <gdbpath></gdbpath> 
    208       <dbgshell></dbgshell> 
    209       <configGdbScript></configGdbScript> 
    210       <runShellScript></runShellScript> 
    211       <runGdbScript></runGdbScript> 
     206      <programargs/> 
     207      <gdbpath/> 
     208      <dbgshell/> 
     209      <configGdbScript/> 
     210      <runShellScript/> 
     211      <runGdbScript/> 
    212212      <breakonloadinglibs>true</breakonloadinglibs> 
    213213      <separatetty>false</separatetty> 
     
    223223    <custom>false</custom> 
    224224    <bzip>false</bzip> 
    225     <archname></archname> 
     225    <archname/> 
    226226    <appname>OpenYahtzee</appname> 
    227227    <version>1.6</version> 
    228     <release></release> 
     228    <release/> 
    229229    <vendor>Guy Rutenberg</vendor> 
    230230    <licence>GPL</licence> 
    231     <summary></summary> 
    232     <group></group> 
    233     <packager></packager> 
    234     <description></description> 
    235     <changelog></changelog> 
     231    <summary/> 
     232    <group/> 
     233    <packager/> 
     234    <description/> 
     235    <changelog/> 
    236236    <devpackage>false</devpackage> 
    237237    <docspackage>false</docspackage> 
     
    242242    <ftpkde>false</ftpkde> 
    243243    <appskde>false</appskde> 
    244     <url></url> 
     244    <url/> 
    245245  </dist> 
    246246</kdevelop> 
  • trunk/OpenYahtzee/openyahtzee.kdevses

    r32 r33  
    1010  </Doc1> 
    1111  <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.cpp" > 
    12    <View0 line="60" Type="Source" /> 
     12   <View0 Type="Source" /> 
    1313  </Doc2> 
    1414  <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/ObjectsID.h" > 
     
    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" > 
  • trunk/OpenYahtzee/src/MainFrame.cpp

    r32 r33  
    4747 
    4848//include the icon file 
    49 #include "icon.xpm" 
    50  
     49#ifdef WIN32 
     50        #include "icon32.xpm" 
     51#else 
     52        #include "icon.xpm" 
     53#endif 
    5154 
    5255//default values 
     
    5861{ 
    5962        //give the frame an icon 
    60         //SetIcon(wxIcon(icon_xpm)); 
     63#ifdef WIN32 
     64        SetIcon(wxIcon(icon32_xpm)); 
     65#else 
    6166        SetIcon(wxIcon(icon_xpm)); 
     67#endif 
     68 
    6269        std::ostringstream sstr; 
    6370 
     
    249256        wxString msg; 
    250257        wxString sqliteversion = wxString(sqlite3_version,wxConvUTF8); 
    251         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); 
     258        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); 
    252259        msg += wxT("SQLite ") + sqliteversion; 
    253260                 
  • trunk/OpenYahtzee/src/Makefile.am

    r30 r33  
    11bin_PROGRAMS = openyahtzee 
    22openyahtzee_SOURCES = openyahtzee.cpp MainFrame.cpp five.xpm four.xpm one.xpm \ 
    3                 six.xpm three.xpm two.xpm DBwrapper.cpp DBwrapper.h SettingsDB.cpp \ 
    4                 HighScoreTableDB.cpp HighScoreDialog.cpp SettingsDialog.cpp icon.xpm 
     3                        six.xpm three.xpm two.xpm DBwrapper.cpp DBwrapper.h SettingsDB.cpp \ 
     4                        HighScoreTableDB.cpp HighScoreDialog.cpp SettingsDialog.cpp icon.xpm icon32.xpm 
    55 
    66# set the include path found by configure 
  • trunk/OpenYahtzee/src/Makefile.in

    r30 r33  
    185185target_alias = @target_alias@ 
    186186openyahtzee_SOURCES = openyahtzee.cpp MainFrame.cpp five.xpm four.xpm one.xpm \ 
    187                 six.xpm three.xpm two.xpm DBwrapper.cpp DBwrapper.h SettingsDB.cpp \ 
    188                 HighScoreTableDB.cpp HighScoreDialog.cpp SettingsDialog.cpp icon.xpm 
     187                        six.xpm three.xpm two.xpm DBwrapper.cpp DBwrapper.h SettingsDB.cpp \ 
     188                        HighScoreTableDB.cpp HighScoreDialog.cpp SettingsDialog.cpp icon.xpm icon32.xpm 
    189189 
    190190 
Note: See TracChangeset for help on using the changeset viewer.