Removes unused icons. Fixes compilation problems due to missing button.

ivanperez-keera · Jun 13, 2013 · 7beb198 · 7beb198
1 parent 7eeb99c
commit 7beb198
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/data/Interface.glade b/data/Interface.glade
@@ -119,6 +119,7 @@
           <object class="GtkToolbar" id="toolbar1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="toolbar_style">both</property>
             <child>
               <object class="GtkToolButton" id="fullScreenToolBtn">
                 <property name="visible">True</property>
@@ -153,6 +154,8 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="use_action_appearance">False</property>
+                <property name="visible_horizontal">False</property>
+                <property name="visible_vertical">False</property>
                 <property name="label" translatable="yes">Run Slow</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-media-play</property>
@@ -220,9 +223,10 @@
             </child>
             <child>
               <object class="GtkToolButton" id="stepBackToolBtn">
-                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="use_action_appearance">False</property>
+                <property name="visible_horizontal">False</property>
+                <property name="visible_vertical">False</property>
                 <property name="label" translatable="yes">Step Back</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-undo</property>

diff --git a/src/View.hs b/src/View.hs
@@ -26,7 +26,7 @@ import View.Objects as Builder
 -- | Initialises the GUI. This must be called before
 -- any other GUI operation.
 initView :: IO ()
-initView = void initGUI
+initView = void unsafeInitGUIForThreadedRTS -- initGUI
 
 -- | Starts a thread for the view.
 startView :: IO ()
@@ -92,7 +92,7 @@ gtkViewAccessor "Builder" "uiBuilder" "stopToolBtn"          "ToolButton"
 gtkViewAccessor "Builder" "uiBuilder" "slowDownToolBtn"      "ToolButton"
 gtkViewAccessor "Builder" "uiBuilder" "speedUpToolBtn"       "ToolButton"
 gtkViewAccessor "Builder" "uiBuilder" "stepForwardToolBtn"   "ToolButton"
-gtkViewAccessor "Builder" "uiBuilder" "stepForwardSmallToolBtn"   "ToolButton"
+-- gtkViewAccessor "Builder" "uiBuilder" "stepForwardSmallToolBtn"   "ToolButton"
 gtkViewAccessor "Builder" "uiBuilder" "stepBackToolBtn"      "ToolButton"
 gtkViewAccessor "Builder" "uiBuilder" "fullScreenToolBtn"    "ToolButton"
 gtkViewAccessor "Builder" "uiBuilder" "fullScreenMenuItem"   "ImageMenuItem"

diff --git a/src/View/Tooltips.hs b/src/View/Tooltips.hs
@@ -48,7 +48,7 @@ tooltipsTable =
  , (asWidget pauseToolBtn,            "Pause"                           )  
  , (asWidget stepBackToolBtn,         "One step back"                   ) 
  , (asWidget stepForwardToolBtn,      "One step forward"                ) 
- , (asWidget stepForwardSmallToolBtn, "One small step forward"          ) 
+ -- , (asWidget stepForwardSmallToolBtn, "One small step forward"          ) 
  , (asWidget fullScreenToolBtn,       "Toggle fullscreen"               )
  , (asWidget fullScreenMenuItem,      "Toggle fullscreen"               )
  , (asWidget speedScale,              "Simulation speed (steps/second)" )