marko10_000
/
apostrophe
forked from Mirrors/apostrophe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UI Tweaks (consistency of toggle buttons) 

Signed-off-by: somas95 <manuel.genoves@gmail.com>
gh-pages
somas95 2018-03-07 18:08:33 +01:00
parent a2d414104a
commit 12c43d414b
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/ui/UberwriterWindow.ui
View File

@ -128,7 +128,6 @@
</child>
</object>
</child>
<accelerator key="o" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
@ -247,28 +246,27 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="mnu_focusmode">
<object class="GtkCheckMenuItem" id="mnu_focusmode">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">Focus Mode</property>
<signal name="activate" handler="menu_activate_focusmode" swapped="no"/>
<property name="label" translatable="yes">Focus Mode</property>
<signal name="toggled" handler="set_focusmode" swapped="no"/>
<accelerator key="d" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
<object class="GtkMenuItem" id="mnu_fullscreen">
<object class="GtkCheckMenuItem" id="mnu_fullscreen">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">Fullscreen</property>
<signal name="activate" handler="menu_activate_fullscreen" swapped="no"/>
<property name="label" translatable="yes">Fullscreen</property>
<signal name="toggled" handler="toggle_fullscreen" swapped="no"/>
<accelerator key="F11" signal="activate"/>
</object>
</child>
<child>
<object class="GtkMenuItem" id="mnu_sidebar">
<object class="GtkCheckMenuItem" id="mnu_sidebar">
<property name="can_focus">False</property>
<property name="label">Sidebar</property>
<signal name="activate" handler="menu_toggle_sidebar" swapped="no"/>
<property name="label" translatable="yes">Sidebar</property>
<accelerator key="F12" signal="activate"/>
</object>
</child>
@ -278,7 +276,6 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Light text on a dark background</property>
<property name="label" translatable="yes">Dark Mode</property>
<property name="draw_as_radio">True</property>
<signal name="activate" handler="dark_mode_toggled" swapped="no"/>
</object>
</child>
@ -288,8 +285,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Switch to preview mode</property>
<property name="label" translatable="yes">Preview</property>
<property name="draw_as_radio">True</property>
<signal name="activate" handler="menu_activate_preview" swapped="no"/>
<signal name="toggled" handler="toggle_preview" swapped="no"/>
<accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>

28
uberwriter/UberwriterWindow.py
View File

@ -164,6 +164,8 @@ class UberwriterWindow(Window):
key, mod = Gtk.accelerator_parse("Escape")
self.fullscreen_button.add_accelerator("activate",
self.accel_group, key, mod, Gtk.AccelFlags.VISIBLE)
self.fullscreen_button.set_active(True)
self.fullscreen_menu_button.set_active(True)
# Hide Menu
self.menubar.hide()
else:
@ -171,6 +173,8 @@ class UberwriterWindow(Window):
key, mod = Gtk.accelerator_parse("Escape")
self.fullscreen_button.remove_accelerator(
self.accel_group, key, mod)
self.fullscreen_button.set_active(False)
self.fullscreen_menu_button.set_active(False)
self.menubar.hide()
self.TextEditor.grab_focus()
@ -184,6 +188,8 @@ class UberwriterWindow(Window):
self.check_scroll(self.TextBuffer.get_insert())
if self.spellcheck != False:
self.SpellChecker._misspelled.set_property('underline', 0)
self.focusmode_menu_button.set_active(True)
self.focusmode_button.set_active(True)
else:
self.remove_typewriter()
self.focusmode = False
@ -200,6 +206,8 @@ class UberwriterWindow(Window):
self.check_scroll()
if self.spellcheck != False:
self.SpellChecker._misspelled.set_property('underline', 4)
self.focusmode_menu_button.set_active(False)
self.focusmode_button.set_active(False)
def scroll_smoothly(self, widget, frame_clock, data = None):
if self.smooth_scroll_data['target_pos'] == -1:
@ -591,8 +599,8 @@ class UberwriterWindow(Window):
def menu_toggle_sidebar(self, widget=None):
self.sidebar.toggle_sidebar()
def menu_activate_preview(self, widget=None):
self.preview_button.emit('activate')
# def menu_activate_preview(self, widget=None):
# self.preview_button.emit('activate')
def toggle_spellcheck(self, widget=None, data=None):
if widget:
@ -674,6 +682,11 @@ class UberwriterWindow(Window):
def toggle_preview(self, widget, data=None):
if widget.get_active():
# Toggle buttons
# self.preview_button.set_active(True)
# self.preview_mnu_button.set_active(True)
# Insert a tag with ID to scroll to
# self.TextBuffer.insert_at_cursor('<span id="scroll_mark"></span>')
# TODO
@ -707,13 +720,17 @@ class UberwriterWindow(Window):
self.ScrolledWindow.add(self.webview)
self.webview.show()
# This saying that all links will be opened in default browser, but local files are opened in appropriate apps:
# This saying that all links will be opened in default browser, \
# but local files are opened in appropriate apps:
self.webview.connect("navigation-requested", self.on_click_link)
else:
self.ScrolledWindow.remove(self.webview)
self.webview.destroy()
self.ScrolledWindow.add(self.EditorViewport)
self.TextEditor.show()
# self.preview_button.set_active(False)
# self.preview_mnu_button.set_active(False)
self.queue_draw()
return True
@ -915,7 +932,7 @@ class UberwriterWindow(Window):
self.connect('open-file', self.open_document)
self.connect('toggle-fullscreen', self.menu_activate_fullscreen)
self.connect('toggle-focusmode', self.menu_activate_focusmode)
self.connect('toggle-preview', self.menu_activate_preview)
#self.connect('toggle-preview', self.menu_activate_preview)
self.connect('toggle-spellcheck', self.toggle_spellcheck)
self.connect('close-window', self.on_mnu_close_activate)
self.connect('toggle-search', self.open_search_and_replace)
@ -972,8 +989,11 @@ class UberwriterWindow(Window):
# Wire up buttons
self.fullscreen_button = builder.get_object('fullscreen_toggle')
self.fullscreen_menu_button = builder.get_object('mnu_fullscreen')
self.focusmode_button = builder.get_object('focus_toggle')
self.focusmode_menu_button = builder.get_object('mnu_focusmode')
self.preview_button = builder.get_object('preview_toggle')
self.preview_mnu_button = builder.get_object('mnu_preview')
self.fullscreen_button.set_name('fullscreen_toggle')
self.focusmode_button.set_name('focus_toggle')