Changeset 14


Ignore:
Timestamp:
11/11/06 08:52:33 (8 years ago)
Author:
guyru
Message:

made the gui much shorter so it would fit small screens

Location:
trunk/OpenYahtzee
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/OpenYahtzee/openyahtzee.kdevses

    r13 r14  
    22<!DOCTYPE KDevPrjSession> 
    33<KDevPrjSession> 
    4  <DocsAndViews NumberOfDocuments="15" > 
     4 <DocsAndViews NumberOfDocuments="10" > 
    55  <Doc0 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.cpp" > 
    66   <View0 Type="Source" /> 
     
    1010  </Doc1> 
    1111  <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreDialog.cpp" > 
    12    <View0 line="78" Type="Source" /> 
     12   <View0 Type="Source" /> 
    1313  </Doc2> 
    1414  <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreTableDB.h" > 
     
    1616  </Doc3> 
    1717  <Doc4 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreDialog.h" > 
    18    <View0 line="0" Type="Source" /> 
     18   <View0 Type="Source" /> 
    1919  </Doc4> 
    2020  <Doc5 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.h" > 
     
    2828  </Doc7> 
    2929  <Doc8 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.cpp" > 
    30    <View0 line="225" Type="Source" /> 
     30   <View0 line="46" Type="Source" /> 
    3131  </Doc8> 
    32   <Doc9 NumberOfViews="1" URL="file:///usr/include/wx-2.6/wx/gtk/bitmap.h" > 
    33    <View0 line="74" Type="Source" /> 
     32  <Doc9 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/openyahtzee.cpp" > 
     33   <View0 line="0" Type="Source" /> 
    3434  </Doc9> 
    35   <Doc10 NumberOfViews="1" URL="file:///usr/include/wx-2.6/wx/window.h" > 
    36    <View0 line="1240" Type="Source" /> 
    37   </Doc10> 
    38   <Doc11 NumberOfViews="1" URL="file:///usr/include/wx-2.6/wx/control.h" > 
    39    <View0 line="102" Type="Source" /> 
    40   </Doc11> 
    41   <Doc12 NumberOfViews="1" URL="file:///usr/include/wx-2.6/wx/gtk/button.h" > 
    42    <View0 line="49" Type="Source" /> 
    43   </Doc12> 
    44   <Doc13 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/openyahtzee.cpp" > 
    45    <View0 line="51" Type="Source" /> 
    46   </Doc13> 
    47   <Doc14 NumberOfViews="1" URL="file:///usr/include/wx-2.6/wx/app.h" > 
    48    <View0 line="86" Type="Source" /> 
    49   </Doc14> 
    5035 </DocsAndViews> 
    5136 <pluginList> 
    5237  <kdevdebugger> 
    5338   <breakpointList> 
    54     <breakpoint0 location="/home/guy/workspace/OpenYahtzee/src/MainFrame.cpp:222" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" > 
     39    <breakpoint0 location="/home/guy/workspace/OpenYahtzee/src/MainFrame.cpp:223" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" > 
    5540     <tracedExpressions/> 
    5641    </breakpoint0> 
  • trunk/OpenYahtzee/src/MainFrame.cpp

    r13 r14  
    4545#include "six.xpm" 
    4646 
     47#define SPACE_SIZE 1 
    4748 
    4849MainFrame::MainFrame(const wxString& title, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE) 
     
    107108 
    108109         
    109         uppergrid->Add(new wxButton(panel,ID_ACES,wxT("Aces")),0,wxALL,3); 
    110         uppergrid->Add(new wxTextCtrl(panel, ID_ACESTEXT),1,wxALL,3); 
    111         uppergrid->Add(new wxButton(panel,ID_TWOS,wxT("Twos")),0,wxALL,3); 
    112         uppergrid->Add(new wxTextCtrl(panel, ID_TWOSTEXT),1,wxALL,3); 
    113         uppergrid->Add(new wxButton(panel,ID_THREES,wxT("Threes")),0,wxALL,3); 
    114         uppergrid->Add(new wxTextCtrl(panel, ID_THREESTEXT),1,wxALL,3); 
    115         uppergrid->Add(new wxButton(panel,ID_FOURS,wxT("Fours")),0,wxALL,3); 
    116         uppergrid->Add(new wxTextCtrl(panel, ID_FOURSTEXT),1,wxALL,3); 
    117         uppergrid->Add(new wxButton(panel,ID_FIVES,wxT("Fives")),0,wxALL,3); 
    118         uppergrid->Add(new wxTextCtrl(panel, ID_FIVESTEXT),1,wxALL,3); 
    119         uppergrid->Add(new wxButton(panel,ID_SIXES,wxT("Sixes")),0,wxALL,3); 
    120         uppergrid->Add(new wxTextCtrl(panel, ID_SIXESTEXT),1,wxALL,3); 
    121         uppergrid->Add(new wxStaticText(panel, wxID_ANY, wxT("Total score:")),0,wxALL,3); 
    122         uppergrid->Add(new wxTextCtrl(panel, ID_UPPERSECTIONTOTAL),1,wxALL,3); 
    123         uppergrid->Add(new wxStaticText(panel, wxID_ANY, wxT("Bonus:")),0,wxALL,3); 
    124         uppergrid->Add(new wxTextCtrl(panel, ID_BONUS),1,wxALL,3); 
    125         uppergrid->Add(new wxStaticText(panel, wxID_ANY, wxT("Total of upper section:")),0,wxALL,3); 
    126         uppergrid->Add(new wxTextCtrl(panel, ID_UPPERTOTAL),1,wxALL,3); 
    127  
    128  
    129         lowergrid->Add(new wxButton(panel,ID_THREEOFAKIND,wxT("3 of a kind")),0,wxALL,3); 
    130         lowergrid->Add(new wxTextCtrl(panel, ID_THREEOFAKINDTEXT),1,wxALL,3); 
    131         lowergrid->Add(new wxButton(panel,ID_FOUROFAKIND,wxT("4 of a kind")),0,wxALL,3); 
    132         lowergrid->Add(new wxTextCtrl(panel, ID_FOUROFAKINDTEXT),1,wxALL,3); 
    133         lowergrid->Add(new wxButton(panel,ID_FULLHOUSE,wxT("Full House")),0,wxALL,3); 
    134         lowergrid->Add(new wxTextCtrl(panel, ID_FULLHOUSETEXT),1,wxALL,3); 
    135         lowergrid->Add(new wxButton(panel,ID_SMALLSEQUENCE,wxT("Sequence of 4")),0,wxALL,3); 
    136         lowergrid->Add(new wxTextCtrl(panel, ID_SMALLSEQUENCETEXT),1,wxALL,3); 
    137         lowergrid->Add(new wxButton(panel,ID_LARGESEQUENCE,wxT("Sequence of 5")),0,wxALL,3); 
    138         lowergrid->Add(new wxTextCtrl(panel, ID_LARGESEQUENCETEXT),1,wxALL,3); 
    139         lowergrid->Add(new wxButton(panel,ID_YAHTZEE,wxT("Yahtzee")),0,wxALL,3); 
    140         lowergrid->Add(new wxTextCtrl(panel, ID_YAHTZEETEXT),1,wxALL,3); 
    141         lowergrid->Add(new wxButton(panel,ID_CHANCE,wxT("Chance")),0,wxALL,3); 
    142         lowergrid->Add(new wxTextCtrl(panel, ID_CHANCETEXT),1,wxALL,3); 
    143         lowergrid->Add(new wxStaticText(panel, wxID_ANY, wxT("Yahtzee Bonus")),0,wxALL,3); 
     110        uppergrid->Add(new wxButton(panel,ID_ACES,wxT("Aces")),0,wxALL,SPACE_SIZE); 
     111        uppergrid->Add(new wxTextCtrl(panel, ID_ACESTEXT),1,wxALL,SPACE_SIZE); 
     112        uppergrid->Add(new wxButton(panel,ID_TWOS,wxT("Twos")),0,wxALL,SPACE_SIZE); 
     113        uppergrid->Add(new wxTextCtrl(panel, ID_TWOSTEXT),1,wxALL,SPACE_SIZE); 
     114        uppergrid->Add(new wxButton(panel,ID_THREES,wxT("Threes")),0,wxALL,SPACE_SIZE); 
     115        uppergrid->Add(new wxTextCtrl(panel, ID_THREESTEXT),1,wxALL,SPACE_SIZE); 
     116        uppergrid->Add(new wxButton(panel,ID_FOURS,wxT("Fours")),0,wxALL,SPACE_SIZE); 
     117        uppergrid->Add(new wxTextCtrl(panel, ID_FOURSTEXT),1,wxALL,SPACE_SIZE); 
     118        uppergrid->Add(new wxButton(panel,ID_FIVES,wxT("Fives")),0,wxALL,SPACE_SIZE); 
     119        uppergrid->Add(new wxTextCtrl(panel, ID_FIVESTEXT),1,wxALL,SPACE_SIZE); 
     120        uppergrid->Add(new wxButton(panel,ID_SIXES,wxT("Sixes")),0,wxALL,SPACE_SIZE); 
     121        uppergrid->Add(new wxTextCtrl(panel, ID_SIXESTEXT),1,wxALL,SPACE_SIZE); 
     122        uppergrid->Add(new wxStaticText(panel, wxID_ANY, wxT("Total score:")),0,wxALL,SPACE_SIZE); 
     123        uppergrid->Add(new wxTextCtrl(panel, ID_UPPERSECTIONTOTAL),1,wxALL,SPACE_SIZE); 
     124        uppergrid->Add(new wxStaticText(panel, wxID_ANY, wxT("Bonus:")),0,wxALL,SPACE_SIZE); 
     125        uppergrid->Add(new wxTextCtrl(panel, ID_BONUS),1,wxALL,SPACE_SIZE); 
     126        uppergrid->Add(new wxStaticText(panel, wxID_ANY, wxT("Total of upper section:")),0,wxALL,SPACE_SIZE); 
     127        uppergrid->Add(new wxTextCtrl(panel, ID_UPPERTOTAL),1,wxALL,SPACE_SIZE); 
     128 
     129 
     130        lowergrid->Add(new wxButton(panel,ID_THREEOFAKIND,wxT("3 of a kind")),0,wxALL,SPACE_SIZE); 
     131        lowergrid->Add(new wxTextCtrl(panel, ID_THREEOFAKINDTEXT),1,wxALL,SPACE_SIZE); 
     132        lowergrid->Add(new wxButton(panel,ID_FOUROFAKIND,wxT("4 of a kind")),0,wxALL,SPACE_SIZE); 
     133        lowergrid->Add(new wxTextCtrl(panel, ID_FOUROFAKINDTEXT),1,wxALL,SPACE_SIZE); 
     134        lowergrid->Add(new wxButton(panel,ID_FULLHOUSE,wxT("Full House")),0,wxALL,SPACE_SIZE); 
     135        lowergrid->Add(new wxTextCtrl(panel, ID_FULLHOUSETEXT),1,wxALL,SPACE_SIZE); 
     136        lowergrid->Add(new wxButton(panel,ID_SMALLSEQUENCE,wxT("Sequence of 4")),0,wxALL,SPACE_SIZE); 
     137        lowergrid->Add(new wxTextCtrl(panel, ID_SMALLSEQUENCETEXT),1,wxALL,SPACE_SIZE); 
     138        lowergrid->Add(new wxButton(panel,ID_LARGESEQUENCE,wxT("Sequence of 5")),0,wxALL,SPACE_SIZE); 
     139        lowergrid->Add(new wxTextCtrl(panel, ID_LARGESEQUENCETEXT),1,wxALL,SPACE_SIZE); 
     140        lowergrid->Add(new wxButton(panel,ID_YAHTZEE,wxT("Yahtzee")),0,wxALL,SPACE_SIZE); 
     141        lowergrid->Add(new wxTextCtrl(panel, ID_YAHTZEETEXT),1,wxALL,SPACE_SIZE); 
     142        lowergrid->Add(new wxButton(panel,ID_CHANCE,wxT("Chance")),0,wxALL,SPACE_SIZE); 
     143        lowergrid->Add(new wxTextCtrl(panel, ID_CHANCETEXT),1,wxALL,SPACE_SIZE); 
     144        lowergrid->Add(new wxStaticText(panel, wxID_ANY, wxT("Yahtzee Bonus")),0,wxALL,SPACE_SIZE); 
    144145        lowergrid->Add(new wxTextCtrl(panel, ID_YAHTZEEBONUSTEXT),1,wxALL,3); 
    145         lowergrid->Add(new wxStaticText(panel, wxID_ANY, wxT("Total of lower section:")),0,wxALL,3); 
    146         lowergrid->Add(new wxTextCtrl(panel, ID_LOWERTOTAL),1,wxALL,3); 
    147         lowergrid->Add(new wxStaticText(panel, wxID_ANY, wxT("Grand Total:")),0,wxALL,3); 
    148         lowergrid->Add(new wxTextCtrl(panel, ID_GRANDTOTAL),1,wxALL,3); 
     146        lowergrid->Add(new wxStaticText(panel, wxID_ANY, wxT("Total of lower section:")),0,wxALL,SPACE_SIZE); 
     147        lowergrid->Add(new wxTextCtrl(panel, ID_LOWERTOTAL),1,wxALL,SPACE_SIZE); 
     148        lowergrid->Add(new wxStaticText(panel, wxID_ANY, wxT("Grand Total:")),0,wxALL,SPACE_SIZE); 
     149        lowergrid->Add(new wxTextCtrl(panel, ID_GRANDTOTAL),1,wxALL,SPACE_SIZE); 
    149150 
    150151        uppersection->Add(uppergrid); 
Note: See TracChangeset for help on using the changeset viewer.