Delete the selection tool

and not fix #54
maoschanz · Jul 29, 2019 · 37cb2d8 · 37cb2d8
1 parent dc66eaa
commit 37cb2d8
Show file tree

Hide file tree

Showing 9 changed files with 316 additions and 724 deletions.
diff --git a/src/drawing.gresource.xml b/src/drawing.gresource.xml
@@ -28,7 +28,6 @@
     <file>tools/ui/tool_pencil.ui</file>
     <file>tools/ui/tool_polygon.ui</file>
     <file>tools/ui/tool_rectangle.ui</file>
-    <file>tools/ui/tool_select.ui</file>
     <file>tools/ui/tool_text.ui</file>
 
     <file>tools/ui/tool_crop.ui</file>

diff --git a/src/meson.build b/src/meson.build
@@ -56,8 +56,6 @@ drawing_sources = [
 	'tools/classic_tools/tool_rectangle.py',
 	'tools/classic_tools/tool_text.py',
 
-	'tools/selection_tools/tool_select.py',
-
 	'tools/selection_tools/abstract_select.py',
 	'tools/selection_tools/rect_select.py',
 	'tools/selection_tools/free_select.py',

diff --git a/src/minimap.py b/src/minimap.py
@@ -36,6 +36,7 @@ def __init__(self, window, minimap_btn, **kwargs):
 		box = builder.get_object('minimap_box')
 
 		self.zoom_scale = builder.get_object('zoom_scale')
+		self.zoom_scale.add_mark(100.0, Gtk.PositionType.TOP, None)
 		self.zoom_scale.connect('value-changed', self.update_zoom_level)
 
 		self.minimap_area = builder.get_object('minimap_area')

diff --git a/src/tools/selection_tools/abstract_select.py b/src/tools/selection_tools/abstract_select.py
@@ -1,4 +1,4 @@
-# tool_select.py
+# abstract_select.py
 
 from gi.repository import Gtk, Gdk, GdkPixbuf
 import cairo
@@ -23,11 +23,9 @@ def __init__(self, tool_id, label, icon_name, window, **kwargs):
 		self.operation_type = None # 'op-define'
 
 		# Special bottom panel
-		builder = Gtk.Builder.new_from_resource( \
-		                '/com/github/maoschanz/drawing/tools/ui/tool_select.ui')
+		path = '/com/github/maoschanz/drawing/ui/selection.ui'
+		builder = Gtk.Builder.new_from_resource(path)
 		self.bottom_panel = builder.get_object('bottom-panel')
-		actions_menu = builder.get_object('actions-menu')
-		builder.get_object('actions_btn').set_menu_model(actions_menu)
 		self.import_box_narrow = builder.get_object('import_box_narrow')
 		self.import_box_long = builder.get_object('import_box_long')
 		self.minimap_label = builder.get_object('minimap_label')
@@ -49,7 +47,7 @@ def get_edition_status(self):
 		return label
 
 	def get_options_model(self):
-		path = '/com/github/maoschanz/drawing/tools/ui/tool_select.ui' # XXX
+		path = '/com/github/maoschanz/drawing/ui/selection.ui'
 		builder = Gtk.Builder.new_from_resource(path)
 		return builder.get_object('options-menu')