self._unit_sort_direction = False
self._value_sort_direction = False
self._units_sort_direction = False
+ self.__isPortrait = False
self._isFullScreen = False
self._clipboard = gtk.clipboard_get()
change_menu_label(widgets, 'exitMenuItem', _('Exit'))
change_menu_label(widgets, 'helpMenuItem', _('Help'))
change_menu_label(widgets, 'aboutMenuItem', _('About'))
- change_menu_label(widgets, 'findButton', _('Find'))
self._categorySelectionButton = widgets.get_widget("categorySelectionButton")
self._categoryView = widgets.get_widget('categoryView')
self._findEntry = widgets.get_widget('findEntry')
self._findLabel = widgets.get_widget('findLabel')
self._findButton = widgets.get_widget('findButton')
+ self._closeSearchButton = widgets.get_widget('closeSearchButton')
self._unitsNameRenderer = gtk.CellRendererText()
self._unitsNameRenderer.set_property("scale", 0.75)
self._categoryModel.append(row)
#--------- connections to GUI ----------------
- self._mainWindow.connect("delete-event", self._on_user_exit)
+ self._mainWindow.connect("destroy", self._on_user_exit)
self._mainWindow.connect("key-press-event", self._on_key_press)
self._mainWindow.connect("window-state-event", self._on_window_state_change)
self._categorySelectionButton.connect("clicked", self._on_category_selector_clicked)
self._findButton.connect("clicked", self._on_find_activate)
self._findEntry.connect("activate", self._on_find_activate)
self._findEntry.connect("changed", self._on_findEntry_changed)
+ self._closeSearchButton.connect("clicked", self._on_toggle_search)
self._previousUnitValue.connect("changed", self._on_previous_unit_value_changed)
self._unitValue.connect("changed", self._on_unit_value_changed)
self._unitValue.connect("key-press-event", self._on_browse_key_press)
self._unitsView.connect("key-press-event", self._on_browse_key_press)
if hildonize.GTK_MENU_USED:
widgets.get_widget("aboutMenuItem").connect("activate", self._on_about_clicked)
+ widgets.get_widget("searchMenuItem").connect("activate", self._on_toggle_search)
widgets.get_widget("exitMenuItem").connect("activate", self._on_user_exit)
for scrollingWidgetName in (
):
scrollingWidget = widgets.get_widget(scrollingWidgetName)
assert scrollingWidget is not None, scrollingWidgetName
- hildonize.hildonize_scrollwindow_with_viewport(scrollingWidget)
+ scroller = hildonize.hildonize_scrollwindow(scrollingWidget)
+ scroller.show_all()
+ # Simplify the UI
if hildonize.IS_HILDON_SUPPORTED or constants.FORCE_HILDON_LIKE:
self._categoryView.get_parent().hide()
self._unitsView.set_headers_visible(False)
else:
self._categorySelectionButton.hide()
- replacementButtons = []
menu = hildonize.hildonize_menu(
self._mainWindow,
widgets.get_widget("mainMenuBar"),
- replacementButtons
)
+ if not hildonize.GTK_MENU_USED:
+ button = gtk.Button("Search")
+ button.connect("clicked", self._on_toggle_search)
+ menu.append(button)
+
+ button = hildonize.hildon.GtkRadioButton(gtk.HILDON_SIZE_AUTO, None)
+ button.set_label("Name")
+ menu.add_filter(button)
+ button.connect("clicked", self._on_click_menu_filter, self._unitNameColumn)
+ button.set_mode(False)
+ filterGroup = button
+
+ button = hildonize.hildon.GtkRadioButton(gtk.HILDON_SIZE_AUTO, filterGroup)
+ button.set_label("Value")
+ menu.add_filter(button)
+ button.connect("clicked", self._on_click_menu_filter, self._unitIntegerColumn)
+ button.set_mode(False)
+
+ button = hildonize.hildon.GtkRadioButton(gtk.HILDON_SIZE_AUTO, filterGroup)
+ button.set_label("Unit")
+ menu.add_filter(button)
+ button.connect("clicked", self._on_click_menu_filter, self._unitSymbolColumn)
+ button.set_mode(False)
+
+ menu.show_all()
if not hildonize.IS_HILDON_SUPPORTED:
_moduleLogger.info("No hildonization support")
- hildonize.set_application_title(
- self._mainWindow, "%s - Unit Conversion Utility" % constants.__pretty_app_name__
+ hildonize.set_application_name(
+ "%s - Unit Conversion Utility" % constants.__pretty_app_name__
)
iconPath = pixmapspath + '/gonvert.png'
if os.path.exists(iconPath):
pass
else:
self._mainWindow.resize(a, b)
+ try:
+ isFullscreen = saved_window["isFullscreen"]
+ except KeyError:
+ pass
+ else:
+ if isFullscreen:
+ self._mainWindow.fullscreen()
+ try:
+ isPortrait = saved_window["isPortrait"]
+ except KeyError:
+ pass
+ else:
+ if isPortrait ^ self.__isPortrait:
+ if isPortrait:
+ orientation = gtk.ORIENTATION_VERTICAL
+ else:
+ orientation = gtk.ORIENTATION_HORIZONTAL
+ self.set_orientation(orientation)
#Restore selections from previously saved settings if it exists and is valid.
categoryIndex = 0
#Get last size of app and save it
window_settings = {
- 'size': self._mainWindow.get_size()
+ 'size': self._mainWindow.get_size(),
+ "isFullscreen": self._isFullScreen,
+ "isPortrait": self.__isPortrait,
}
windowDatPath = "/".join((constants._data_path_, "window.dat"))
pickle.dump(window_settings, open(windowDatPath, 'w'))
value = float(userEntry)
return value
+ def _select_sort_column(self, col):
+ #Determine which column requires sorting
+ columns = self._get_column_sort_stuff()
+ for columnIndex, (maybeCol, directionName, col_cmp) in enumerate(columns):
+ if col is maybeCol:
+ direction = getattr(self, directionName)
+ gtkDirection = gtk.SORT_ASCENDING if direction else gtk.SORT_DESCENDING
+
+ # cause a sort
+ self._sortedUnitModel.set_sort_column_id(columnIndex, gtkDirection)
+
+ # set the visual for sorting
+ col.set_sort_indicator(True)
+ col.set_sort_order(not direction)
+
+ setattr(self, directionName, not direction)
+ break
+ else:
+ maybeCol.set_sort_indicator(False)
+ else:
+ assert False, "Unknown column: %s" % (col.get_title(), )
+
+ def set_orientation(self, orientation):
+ if orientation == gtk.ORIENTATION_VERTICAL:
+ hildonize.window_to_portrait(self._mainWindow)
+ self.__isPortrait = True
+ elif orientation == gtk.ORIENTATION_HORIZONTAL:
+ hildonize.window_to_landscape(self._mainWindow)
+ self.__isPortrait = False
+ else:
+ raise NotImplementedError(orientation)
+
+ def get_orientation(self):
+ return gtk.ORIENTATION_VERTICAL if self.__isPortrait else gtk.ORIENTATION_HORIZONTAL
+
+ def _toggle_rotate(self):
+ if self.__isPortrait:
+ self.set_orientation(gtk.ORIENTATION_HORIZONTAL)
+ else:
+ self.set_orientation(gtk.ORIENTATION_VERTICAL)
+
@gtk_toolbox.log_exception(_moduleLogger)
def _on_key_press(self, widget, event, *args):
"""
else:
self._mainWindow.fullscreen()
elif event.keyval == gtk.keysyms.f and event.get_state() & gtk.gdk.CONTROL_MASK:
- self._toggle_find()
+ if not hildonize.GTK_MENU_USED:
+ self._toggle_find()
elif event.keyval == gtk.keysyms.p and event.get_state() & gtk.gdk.CONTROL_MASK:
self._find_previous()
elif event.keyval == gtk.keysyms.n and event.get_state() & gtk.gdk.CONTROL_MASK:
self._find_next()
- elif event.keyval == ord("l") and event.get_state() & gtk.gdk.CONTROL_MASK:
+ elif event.keyval == gtk.keysyms.o and event.get_state() & gtk.gdk.CONTROL_MASK:
+ self._toggle_rotate()
+ elif (
+ event.keyval in (gtk.keysyms.w, gtk.keysyms.q) and
+ event.get_state() & gtk.gdk.CONTROL_MASK
+ ):
+ self._mainWindow.destroy()
+ elif event.keyval == gtk.keysyms.l and event.get_state() & gtk.gdk.CONTROL_MASK:
with open(constants._user_logpath_, "r") as f:
logLines = f.xreadlines()
log = "".join(logLines)
self._clipboard.set_text(str(log))
@gtk_toolbox.log_exception(_moduleLogger)
+ def _on_toggle_search(self, *args):
+ self._toggle_find()
+
+ @gtk_toolbox.log_exception(_moduleLogger)
def _on_browse_key_press(self, widget, event, *args):
if event.keyval == gtk.keysyms.uparrow or event.keyval == gtk.keysyms.Up:
index, column = self._unitsView.get_cursor()
newIndex = max(index[0]-1, 0)
- self._unitsView.set_cursor((newIndex, ), column, True)
+ path = (newIndex, )
+ self._unitsView.set_cursor(path, column, True)
+ self._unitsView.scroll_to_cell(path, column, False, 0, 0)
return True # override default behavior
elif event.keyval == gtk.keysyms.downarrow or event.keyval == gtk.keysyms.Down:
index, column = self._unitsView.get_cursor()
newIndex = min(index[0]+1, len(self._unitModel)-1)
- self._unitsView.set_cursor((newIndex, ), column, True)
+ path = (newIndex, )
+ self._unitsView.set_cursor(path, column, True)
+ self._unitsView.scroll_to_cell(path, column, False, 0, 0)
return True # override default behavior
@gtk_toolbox.log_exception(_moduleLogger)
self._findButton.grab_focus()
@gtk_toolbox.log_exception(_moduleLogger)
+ def _on_click_menu_filter(self, button, col):
+ self._select_sort_column(col)
+
+ @gtk_toolbox.log_exception(_moduleLogger)
def _on_click_unit_column(self, col):
"""
Sort the contents of the col when the user clicks on the title.
"""
- #Determine which column requires sorting
- columns = self._get_column_sort_stuff()
- for columnIndex, (maybeCol, directionName, col_cmp) in enumerate(columns):
- if col is maybeCol:
- direction = getattr(self, directionName)
- gtkDirection = gtk.SORT_ASCENDING if direction else gtk.SORT_DESCENDING
-
- # cause a sort
- self._sortedUnitModel.set_sort_column_id(columnIndex, gtkDirection)
-
- # set the visual for sorting
- col.set_sort_indicator(True)
- col.set_sort_order(not direction)
-
- setattr(self, directionName, not direction)
- break
- else:
- maybeCol.set_sort_indicator(False)
- else:
- assert False, "Unknown column: %s" % (col.get_title(), )
+ self._select_sort_column(col)
@gtk_toolbox.log_exception(_moduleLogger)
def _on_category_selector_clicked(self, *args):
selectedCategoryName = unit_data.UNIT_CATEGORIES[newIndex]
self._categorySelectionButton.get_child().set_markup("<big>%s</big>" % selectedCategoryName)
- self._categoryView.set_cursor(newIndex, self._categoryColumn, False)
- self._categoryView.grab_focus()
+ self._switch_category(selectedCategoryName)
@gtk_toolbox.log_exception(_moduleLogger)
def _on_click_category(self, *args):
projects / gonvert / blobdiff