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

Redesign of the headerbar

webkit2png
somas95 2018-06-30 02:11:47 +02:00
parent ca1a9d6364
commit 96731ef8f6
8 changed files with 148 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
data/ui/App_menu.ui
View File

@ -1,51 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<menu id="app-menu">
<section>
<item>
<!--
<attribute name="action">win.change_label</attribute>
<attribute name="target">String 1</attribute>
-->
<attribute name="label" translatable="yes">New window</attribute>
</item>
</section>
<!--
<section>
<item>
<attribute name="action">win.maximize</attribute>
<attribute name="label" translatable="yes">Preferences</attribute>
</item>
</section>
-->
<section>
<item>
<attribute name="action">app.shortcuts</attribute>
<attribute name="label" translatable="yes">_Shortcuts</attribute>
</item>
<item>
<attribute name="action">app.help</attribute>
<attribute name="label" translatable="yes">Pandoc _Help</attribute>
</item>
<item>
<attribute name="action">app.about</attribute>
<attribute name="label" translatable="yes">_About</attribute>
</item>
<item>
<attribute name="action">app.translate</attribute>
<attribute name="label" translatable="yes">Help to _translate</attribute>
</item>
<item>
<attribute name="action">app.donate</attribute>
<attribute name="label" translatable="yes">Donate to the project</attribute>
</item>
</section>
<section>
<item>
<attribute name="action">app.quit</attribute>
<attribute name="label" translatable="yes">_Quit</attribute>
<attribute name="accel">&lt;Primary&gt;q</attribute>
</item>
</section>
</menu>
</interface>

66
data/ui/Menu.ui 100644
View File

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<menu id="Menu">
<section>
<attribute name="display-hint">horizontal-buttons</attribute>
<item>
<attribute name="label" translatable="yes">Focus Mode</attribute>
<attribute name="action">app.focus_mode</attribute>
<attribute name="verb-icon">find-location-symbolic</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Preview</attribute>
<attribute name="action">app.preview</attribute>
<attribute name="verb-icon">x-office-presentation-symbolic</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Fullscreen</attribute>
<attribute name="action">app.fullscreen</attribute>
<attribute name="verb-icon">view-fullscreen-symbolic</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes">Save _As</attribute>
<attribute name="action">app.save_as</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Export</attribute>
<attribute name="action">app.export</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Copy HTML</attribute>
<attribute name="action">app.HTML_copy</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes">Preferences</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes">Open Tutorial</attribute>
<attribute name="action">app.open_examples</attribute>
</item>
<item>
<attribute name="action">app.help</attribute>
<attribute name="label" translatable="yes">Pandoc _Help</attribute>
</item>
<item>
<attribute name="action">app.shortcuts</attribute>
<attribute name="label" translatable="yes">_Shortcuts</attribute>
</item>
</section>
<section>
<item>
<attribute name="action">app.about</attribute>
<attribute name="label" translatable="yes">_About</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Quit</attribute>
<attribute name="action">app.quit</attribute>
</item>
</section>
</menu>
</interface>

43
data/ui/SettingsMenu.ui
View File

@ -1,43 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<menu id="SettingsMenu">
<section>
<item>
<attribute name="label" translatable="yes">_New</attribute>
<attribute name="action">app.new</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Open</attribute>
<attribute name="action">app.open</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Open Recent File</attribute>
<attribute name="action">app.open_recent</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Open Examples</attribute>
<attribute name="action">app.open_examples</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Save</attribute>
<attribute name="action">app.save</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Save _As</attribute>
<attribute name="action">app.save_as</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Export</attribute>
<attribute name="action">app.export</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Copy as HTML</attribute>
<attribute name="action">app.HTML_copy</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Quit</attribute>
<attribute name="action">app.quit</attribute>
</item>
</section>
</menu>
</interface>

64
data/ui/UberwriterWindow.ui
View File

@ -103,61 +103,6 @@
<object class="GtkGrid" id="status_bar_box"> <object class="GtkGrid" id="status_bar_box">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child>
<object class="GtkToggleButton" id="focus_toggle">
<property name="label" translatable="yes">Focus Mode</property>
<property name="height_request">15</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Go into focus mode</property>
<property name="tooltip_text" translatable="yes">Go into focus mode</property>
<property name="halign">center</property>
<property name="relief">none</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="fullscreen_toggle">
<property name="label" translatable="yes">Fullscreen</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Go into fullscreen mode</property>
<property name="tooltip_text" translatable="yes">Go into fullscreen mode</property>
<property name="halign">start</property>
<property name="relief">none</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="preview_toggle">
<property name="label" translatable="yes">Preview</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Show HTML preview</property>
<property name="tooltip_text" translatable="yes">Show HTML preview</property>
<property name="halign">start</property>
<property name="relief">none</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child> <child>
<object class="GtkLabel" id="label2"> <object class="GtkLabel" id="label2">
<property name="visible">True</property> <property name="visible">True</property>
@ -230,6 +175,15 @@
<property name="top_attach">0</property> <property name="top_attach">0</property>
</packing> </packing>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
</child> </child>
</object> </object>

33
data/ui/WindowMenu.ui
View File

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<menu id="WindowMenu">
<section>
<item>
<attribute name="label" translatable="yes">Focus Mode</attribute>
<attribute name="action">app.focus_mode</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Fullscreen</attribute>
<attribute name="action">app.fullscreen</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Dark Mode</attribute>
<attribute name="action">app.dark_mode</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Preview</attribute>
<attribute name="action">app.preview</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes">Search and Replace</attribute>
<attribute name="action">app.search</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Auto _Spellcheck</attribute>
<attribute name="action">app.spellcheck</attribute>
</item>
</section>
</menu>
</interface>

39
data/ui/WindowMenubck.xml
View File

@ -1,39 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<menu id="WindowMenu">
<section>
<item>
<attribute name="label" translatable="yes">Focus Mode</attribute>
<signal name="toggled" handler="set_focusmode" swapped="no"/>
</item>
<item>
<attribute name="label" translatable="yes">Fullscreen</attribute>
<signal name="toggled" handler="toggle_fullscreen" swapped="no"/>
</item>
<item>
<attribute name="tooltip_text" translatable="yes">Light text on a dark background</attribute>
<attribute name="label" translatable="yes">Dark Mode</attribute>
<signal name="activate" handler="dark_mode_toggled" swapped="no"/>
</item>
<item>
<attribute name="tooltip_text" translatable="yes">Switch to preview mode</attribute>
<attribute name="label" translatable="yes">Preview</attribute>
<signal name="toggled" handler="toggle_preview" swapped="no"/>
</item>
</section>
<section>
<item>
<attribute name="tooltip_text" translatable="yes">Open Search and Replace</attribute>
<attribute name="label" translatable="yes">Search and Replace ...</attribute>
<attribute name="use_underline">True</attribute>
<signal name="activate" handler="open_search_and_replace" swapped="no"/>
</item>
<item>
<attribute name="label" translatable="yes">Auto _Spellcheck</attribute>
<attribute name="use_underline">True</attribute>
<attribute name="active">True</attribute>
<signal name="toggled" handler="toggle_spellcheck" swapped="no"/>
</item>
</section>
</menu>
</interface>

133
uberwriter/UberwriterWindow.py
View File

@ -161,12 +161,10 @@ class UberwriterWindow(Window):
def toggle_fullscreen(self, state): def toggle_fullscreen(self, state):
if state.get_boolean(): if state.get_boolean():
self.fullscreen() self.fullscreen()
self.fullscreen_button.set_active(True)
self.fullscr_events.show() self.fullscr_events.show()
else: else:
self.unfullscreen() self.unfullscreen()
self.fullscreen_button.set_active(False)
self.fullscr_events.hide() self.fullscr_events.hide()
self.TextEditor.grab_focus() self.TextEditor.grab_focus()
@ -180,7 +178,6 @@ class UberwriterWindow(Window):
self.check_scroll(self.TextBuffer.get_insert()) self.check_scroll(self.TextBuffer.get_insert())
if self.spellcheck != False: if self.spellcheck != False:
self.SpellChecker._misspelled.set_property('underline', 0) self.SpellChecker._misspelled.set_property('underline', 0)
self.focusmode_button.set_active(True)
else: else:
self.remove_typewriter() self.remove_typewriter()
self.focusmode = False self.focusmode = False
@ -197,7 +194,6 @@ class UberwriterWindow(Window):
self.check_scroll() self.check_scroll()
if self.spellcheck != False: if self.spellcheck != False:
self.SpellChecker._misspelled.set_property('underline', 4) self.SpellChecker._misspelled.set_property('underline', 4)
self.focusmode_button.set_active(False)
def scroll_smoothly(self, widget, frame_clock, data=None): def scroll_smoothly(self, widget, frame_clock, data=None):
if self.smooth_scroll_data['target_pos'] == -1: if self.smooth_scroll_data['target_pos'] == -1:
@ -215,8 +211,8 @@ class UberwriterWindow(Window):
self.smooth_scroll_acttarget = self.smooth_scroll_data['target_pos'] self.smooth_scroll_acttarget = self.smooth_scroll_data['target_pos']
if now < self.smooth_scroll_endtime: if now < self.smooth_scroll_endtime:
t = float(now - self.smooth_scroll_starttime) \ t = float(now - self.smooth_scroll_starttime) / float(
/ float(self.smooth_scroll_endtime - self.smooth_scroll_starttime) self.smooth_scroll_endtime - self.smooth_scroll_starttime)
else: else:
t = 1 t = 1
pos = self.smooth_scroll_data['source_pos'] \ pos = self.smooth_scroll_data['source_pos'] \
@ -609,7 +605,8 @@ class UberwriterWindow(Window):
elif status.get_boolean(): elif status.get_boolean():
self.SpellChecker = SpellChecker( self.SpellChecker = SpellChecker(
self.TextEditor, self, locale.getdefaultlocale()[0], collapse=False) self.TextEditor, self, locale.getdefaultlocale()[0],
collapse=False)
if self.auto_correct: if self.auto_correct:
self.auto_correct.set_language(self.SpellChecker.language) self.auto_correct.set_language(self.SpellChecker.language)
self.SpellChecker.connect_language_change( self.SpellChecker.connect_language_change(
@ -895,7 +892,7 @@ class UberwriterWindow(Window):
self.fullscr_hb_revealer.set_reveal_child(True) self.fullscr_hb_revealer.set_reveal_child(True)
def hide_fs_hb(self, widget, data=None): def hide_fs_hb(self, widget, data=None):
if self.btn_settings_fs.get_active() or self.bbtn_fs.get_active(): if self.fs_btn_menu.get_active():
pass pass
else: else:
self.fullscr_hb_revealer.set_reveal_child(False) self.fullscr_hb_revealer.set_reveal_child(False)
@ -984,27 +981,42 @@ class UberwriterWindow(Window):
self.hb_revealer.set_reveal_child(True) self.hb_revealer.set_reveal_child(True)
self.hb.show() self.hb.show()
# TODO: this button/model names are HORRIBLE. Find better ones btn_new = Gtk.Button().new_from_icon_name("document-new-symbolic",
Gtk.IconSize.BUTTON)
btn_open = Gtk.Button().new_from_icon_name("document-open-symbolic",
Gtk.IconSize.BUTTON)
btn_recent = Gtk.Button().new_from_icon_name("document-open-recent-symbolic",
Gtk.IconSize.BUTTON)
btn_save = Gtk.Button().new_from_icon_name("document-save-symbolic",
Gtk.IconSize.BUTTON)
btn_search = Gtk.Button().new_from_icon_name("system-search-symbolic",
Gtk.IconSize.BUTTON)
btn_menu = Gtk.MenuButton().new()
btn_menu.set_image(Gtk.Image.new_from_icon_name("open-menu-symbolic",
Gtk.IconSize.BUTTON))
btn_settings = Gtk.MenuButton() btn_new.set_action_name("app.new")
btn_settings.props.image = Gtk.Image.new_from_icon_name( btn_open.set_action_name("app.open")
'emblem-system-symbolic', Gtk.IconSize.BUTTON) btn_recent.set_action_name("app.open_recent")
btn_settings.props.use_popover = True btn_save.set_action_name("app.save")
self.builder_window_menu = get_builder('WindowMenu') btn_search.set_action_name("app.search")
self.model = self.builder_window_menu.get_object("WindowMenu")
btn_settings.set_menu_model(self.model)
bbtn = Gtk.MenuButton() btn_menu.set_use_popover(True)
bbtn.props.use_popover = True self.builder_window_menu = get_builder('Menu')
self.builder_settings_menu = get_builder('SettingsMenu') self.model = self.builder_window_menu.get_object("Menu")
self.model2 = self.builder_settings_menu.get_object("SettingsMenu") btn_menu.set_menu_model(self.model)
bbtn.set_menu_model(self.model2)
self.hb.pack_start(bbtn) self.hb.pack_start(btn_new)
self.hb.pack_end(btn_settings) self.hb.pack_start(btn_open)
self.hb.pack_start(btn_recent)
self.hb.pack_end(btn_menu)
self.hb.pack_end(btn_search)
self.hb.pack_end(btn_save)
self.hb.show_all() self.hb.show_all()
# same for fullscreen headerbar # same for fullscreen headerbar
# TODO: Refactorice: this is duplicated code!
self.fullscr_events = self.builder.get_object("FullscreenEventbox") self.fullscr_events = self.builder.get_object("FullscreenEventbox")
self.fullscr_hb_revealer = self.builder.get_object( self.fullscr_hb_revealer = self.builder.get_object(
@ -1016,31 +1028,48 @@ class UberwriterWindow(Window):
self.fullscr_hb.show() self.fullscr_hb.show()
self.fullscr_events.hide() self.fullscr_events.hide()
self.btn_settings_fs = Gtk.MenuButton() fs_btn_new = Gtk.Button().new_from_icon_name("document-new-symbolic",
self.btn_settings_fs.props.image = Gtk.Image.new_from_icon_name( Gtk.IconSize.BUTTON)
'emblem-system-symbolic', Gtk.IconSize.BUTTON) fs_btn_open = Gtk.Button().new_from_icon_name("document-open-symbolic",
self.btn_settings_fs.props.use_popover = True Gtk.IconSize.BUTTON)
self.btn_settings_fs.set_menu_model(self.model) fs_btn_recent = Gtk.Button().new_from_icon_name("document-open-recent-symbolic",
Gtk.IconSize.BUTTON)
fs_btn_save = Gtk.Button().new_from_icon_name("document-save-symbolic",
Gtk.IconSize.BUTTON)
fs_btn_search = Gtk.Button().new_from_icon_name("system-search-symbolic",
Gtk.IconSize.BUTTON)
self.fs_btn_menu = Gtk.MenuButton().new()
self.fs_btn_menu.set_image(Gtk.Image.new_from_icon_name("open-menu-symbolic",
Gtk.IconSize.BUTTON))
fs_btn_exit = Gtk.Button().new_from_icon_name("view-restore-symbolic",
Gtk.IconSize.BUTTON)
fs_btn_new.set_action_name("app.new")
fs_btn_open.set_action_name("app.open")
fs_btn_recent.set_action_name("app.open_recent")
fs_btn_save.set_action_name("app.save")
fs_btn_search.set_action_name("app.search")
fs_btn_exit.set_action_name("app.fullscreen")
self.bbtn_fs = Gtk.MenuButton() self.fs_btn_menu.set_use_popover(True)
self.bbtn_fs.props.use_popover = True self.builder_window_menu = get_builder('Menu')
self.bbtn_fs.set_menu_model(self.model2) self.model = self.builder_window_menu.get_object("Menu")
self.fs_btn_menu.set_menu_model(self.model)
btn_exit_fs = Gtk.Button() self.fullscr_hb.pack_start(fs_btn_new)
btn_exit_fs.props.image = Gtk.Image.new_from_icon_name( self.fullscr_hb.pack_start(fs_btn_open)
'view-restore-symbolic', Gtk.IconSize.BUTTON) self.fullscr_hb.pack_start(fs_btn_recent)
btn_exit_fs.set_action_name("app.fullscreen") self.fullscr_hb.pack_end(fs_btn_exit)
self.fullscr_hb.pack_end(self.fs_btn_menu)
self.fullscr_hb.pack_start(self.bbtn_fs) self.fullscr_hb.pack_end(fs_btn_search)
self.fullscr_hb.pack_end(btn_exit_fs) self.fullscr_hb.pack_end(fs_btn_save)
self.fullscr_hb.pack_end(self.btn_settings_fs)
self.fullscr_hb.show_all() self.fullscr_hb.show_all()
# this is a little tricky # this is a little tricky
# we show hb when the cursor enters an area of 1 px at the top of the window # we show hb when the cursor enters an area of 1 px at the top of the window
# as the hb is shown the height of the eventbox grows to accomodate it # as the hb is shown the height of the eventbox grows to accomodate it
self.fullscr_events.connect('enter_notify_event', self.show_fs_hb) self.fullscr_events.connect('enter_notify_event', self.show_fs_hb)
self.fullscr_events.connect('leave_notify_event', self.hide_fs_hb) self.fullscr_events.connect('leave_notify_event', self.hide_fs_hb)
self.btn_settings_fs.connect('focus_out_event', self.hide_fs_hb) self.fs_btn_menu.get_popover().connect('closed', self.hide_fs_hb)
self.title_end = " – UberWriter" self.title_end = " – UberWriter"
self.set_headerbar_title("New File" + self.title_end) self.set_headerbar_title("New File" + self.title_end)
@ -1050,25 +1079,6 @@ class UberwriterWindow(Window):
self.word_count = builder.get_object('word_count') self.word_count = builder.get_object('word_count')
self.char_count = builder.get_object('char_count') self.char_count = builder.get_object('char_count')
# Wire up buttons
self.fullscreen_button = builder.get_object('fullscreen_toggle')
self.focusmode_button = builder.get_object('focus_toggle')
self.preview_button = builder.get_object('preview_toggle')
self.fullscreen_button.set_action_name("app.fullscreen")
self.focusmode_button.set_action_name("app.focus_mode")
self.preview_button.set_action_name("app.preview")
self.fullscreen_button.set_name('fullscreen_toggle')
self.focusmode_button.set_name('focus_toggle')
self.preview_button.set_name('preview_toggle')
self.export_pdf_button = builder.get_object('mnu_export_pdf')
# Gray export to pdf if pdftex not avaliable
if not helpers.exist_executable('pdftex'):
self.export_pdf_button.set_sensitive(False)
# Setup status bar hide after 3 seconds # Setup status bar hide after 3 seconds
self.status_bar = builder.get_object('status_bar_box') self.status_bar = builder.get_object('status_bar_box')
@ -1205,8 +1215,9 @@ class UberwriterWindow(Window):
# Setting up spellcheck # Setting up spellcheck
self.auto_correct = None self.auto_correct = None
try: try:
self.SpellChecker = SpellChecker(self.TextEditor, self.SpellChecker = SpellChecker(
locale.getdefaultlocale()[0], collapse=False) self.TextEditor, locale.getdefaultlocale()[0],
collapse=False)
if self.auto_correct: if self.auto_correct:
self.auto_correct.set_language(self.SpellChecker.language) self.auto_correct.set_language(self.SpellChecker.language)
self.SpellChecker.connect_language_change( self.SpellChecker.connect_language_change(

7
uberwriter_lib/AppWindow.py
View File

@ -110,7 +110,7 @@ class Application(Gtk.Application):
def do_startup(self): def do_startup(self):
Gtk.Application.do_startup(self) Gtk.Application.do_startup(self)
'''AppMenu Actions''' '''Actions'''
action = Gio.SimpleAction.new("help", None) action = Gio.SimpleAction.new("help", None)
action.connect("activate", self.on_help) action.connect("activate", self.on_help)
@ -136,8 +136,6 @@ class Application(Gtk.Application):
action.connect("activate", self.on_quit) action.connect("activate", self.on_quit)
self.add_action(action) self.add_action(action)
'''Right menu actions'''
set_dark_mode = self.settings.get_value("dark-mode") set_dark_mode = self.settings.get_value("dark-mode")
action = Gio.SimpleAction.new_stateful("dark_mode", action = Gio.SimpleAction.new_stateful("dark_mode",
None, None,
@ -213,9 +211,6 @@ class Application(Gtk.Application):
action.connect("activate", self.on_html_copy) action.connect("activate", self.on_html_copy)
self.add_action(action) self.add_action(action)
builder = get_builder('App_menu')
self.set_app_menu(builder.get_object("app-menu"))
'''Shortcuts''' '''Shortcuts'''
self.set_accels_for_action("app.focus_mode",["<Ctl>d"]) self.set_accels_for_action("app.focus_mode",["<Ctl>d"])