Index: trunk/OpenYahtzee/openyahtzee.kdevses
===================================================================
--- trunk/OpenYahtzee/openyahtzee.kdevses	(revision 86)
+++ trunk/OpenYahtzee/openyahtzee.kdevses	(revision 87)
@@ -4,23 +4,23 @@
  <DocsAndViews NumberOfDocuments="8" >
   <Doc0 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/About.cpp" >
-   <View0 line="106" Type="Source" />
+   <View0 Type="Source" />
   </Doc0>
   <Doc1 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/openyahtzee.cpp" >
-   <View0 line="0" Type="Source" />
+   <View0 Type="Source" />
   </Doc1>
   <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/MainFrame.cpp" >
-   <View0 line="505" Type="Source" />
+   <View0 line="199" Type="Source" />
   </Doc2>
   <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/MainFrame.h" >
-   <View0 line="31" Type="Source" />
+   <View0 line="99" Type="Source" />
   </Doc3>
   <Doc4 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/About.h" >
-   <View0 line="24" Type="Source" />
+   <View0 Type="Source" />
   </Doc4>
   <Doc5 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/UtilityFunctions.h" >
-   <View0 line="30" Type="Source" />
+   <View0 Type="Source" />
   </Doc5>
   <Doc6 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/UtilityFunctions.cpp" >
-   <View0 line="23" Type="Source" />
+   <View0 Type="Source" />
   </Doc6>
   <Doc7 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/wxDynamicBitmap.cpp" >
Index: trunk/OpenYahtzee/src/MainFrame.cpp
===================================================================
--- trunk/OpenYahtzee/src/MainFrame.cpp	(revision 86)
+++ trunk/OpenYahtzee/src/MainFrame.cpp	(revision 87)
@@ -122,8 +122,17 @@
 	wxPanel* panel = new wxPanel(this, ID_PANEL,
    		wxDefaultPosition, wxDefaultSize);
-
-	wxBoxSizer *topSizer = new wxBoxSizer( wxHORIZONTAL );
-	wxBoxSizer *sectionsSizer = new wxBoxSizer( wxVERTICAL );
-	wxBoxSizer *diceSizer = new wxBoxSizer( wxVERTICAL );
+	m_horizontallayout = 0; //TODO remove this line
+	wxBoxSizer *topSizer;
+	wxBoxSizer *sectionsSizer;
+	wxFlexGridSizer *diceSizer;
+	if (m_horizontallayout) {
+		topSizer = new wxBoxSizer( wxVERTICAL );
+		sectionsSizer = new wxBoxSizer( wxHORIZONTAL );
+		diceSizer = new wxFlexGridSizer(2, 0, 0, 0);
+	} else {
+		topSizer = new wxBoxSizer( wxHORIZONTAL );
+		sectionsSizer = new wxBoxSizer( wxVERTICAL );
+		diceSizer = new wxFlexGridSizer(1, 0, 0);;
+	}
 
 	wxSizer *uppersection = new wxStaticBoxSizer( new wxStaticBox( panel, wxID_ANY, wxT("Upper Section") ), wxVERTICAL);
@@ -183,16 +192,30 @@
 
 	//BEGIN layout for the dice section of the score board
-	diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE1,*bitmap_dices[0]),0,wxALL,3);
-	diceSizer->Add(new wxCheckBox(panel, ID_DICE1KEEP, wxT("Keep")),0,wxBOTTOM,10);
-	diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE2,*bitmap_dices[1]),0,wxALL,3);
-	diceSizer->Add(new wxCheckBox(panel, ID_DICE2KEEP, wxT("Keep")),0,wxBOTTOM,10);
-	diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE3,*bitmap_dices[2]),0,wxALL,3);
-	diceSizer->Add(new wxCheckBox(panel, ID_DICE3KEEP, wxT("Keep")),0,wxBOTTOM,10);
-	diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE4,*bitmap_dices[3]),0,wxALL,3);
-	diceSizer->Add(new wxCheckBox(panel, ID_DICE4KEEP, wxT("Keep")),0,wxBOTTOM,10);
-	diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE5,*bitmap_dices[4]),0,wxALL,3);
-	diceSizer->Add(new wxCheckBox(panel, ID_DICE5KEEP, wxT("Keep")),0,wxBOTTOM,10);
-	diceSizer->Add(new wxButton(panel, ID_ROLL, wxT("Roll")),0,wxALL,3);
-	/*===> END layout for the dice section of the score board *******/
+	if (m_horizontallayout) {
+		diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE1,*bitmap_dices[0]),0,wxALL,3);
+		diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE2,*bitmap_dices[1]),0,wxALL,3);
+		diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE3,*bitmap_dices[2]),0,wxALL,3);
+		diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE4,*bitmap_dices[3]),0,wxALL,3);
+		diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE5,*bitmap_dices[4]),0,wxALL,3);
+		diceSizer->Add(new wxButton(panel, ID_ROLL, wxT("Roll!"),wxDefaultPosition,wxSize(64,64)),0,wxALL,3);
+		diceSizer->Add(new wxCheckBox(panel, ID_DICE1KEEP, wxT("Keep")),0,wxBOTTOM,10);
+		diceSizer->Add(new wxCheckBox(panel, ID_DICE2KEEP, wxT("Keep")),0,wxBOTTOM,10);
+		diceSizer->Add(new wxCheckBox(panel, ID_DICE3KEEP, wxT("Keep")),0,wxBOTTOM,10);
+		diceSizer->Add(new wxCheckBox(panel, ID_DICE4KEEP, wxT("Keep")),0,wxBOTTOM,10);
+		diceSizer->Add(new wxCheckBox(panel, ID_DICE5KEEP, wxT("Keep")),0,wxBOTTOM,10);
+	} else {
+		diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE1,*bitmap_dices[0]),0,wxALL,3);
+		diceSizer->Add(new wxCheckBox(panel, ID_DICE1KEEP, wxT("Keep")),0,wxBOTTOM,10);
+		diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE2,*bitmap_dices[1]),0,wxALL,3);
+		diceSizer->Add(new wxCheckBox(panel, ID_DICE2KEEP, wxT("Keep")),0,wxBOTTOM,10);
+		diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE3,*bitmap_dices[2]),0,wxALL,3);
+		diceSizer->Add(new wxCheckBox(panel, ID_DICE3KEEP, wxT("Keep")),0,wxBOTTOM,10);
+		diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE4,*bitmap_dices[3]),0,wxALL,3);
+		diceSizer->Add(new wxCheckBox(panel, ID_DICE4KEEP, wxT("Keep")),0,wxBOTTOM,10);
+		diceSizer->Add(new wxDynamicBitmap(panel,ID_DICE5,*bitmap_dices[4]),0,wxALL,3);
+		diceSizer->Add(new wxCheckBox(panel, ID_DICE5KEEP, wxT("Keep")),0,wxBOTTOM,10);
+		diceSizer->Add(new wxButton(panel, ID_ROLL, wxT("Roll!"),wxDefaultPosition,wxSize(64,64)),0,wxALL,3);
+	}
+	//END layout for the dice section of the score board *******/
 
 	
Index: trunk/OpenYahtzee/src/MainFrame.h
===================================================================
--- trunk/OpenYahtzee/src/MainFrame.h	(revision 86)
+++ trunk/OpenYahtzee/src/MainFrame.h	(revision 87)
@@ -98,4 +98,6 @@
 	bool m_calculatesubtotal; //sets whether to calculate the subtotal after every score or not
 
+	bool m_horizontallayout;
+
 };
 #endif
