mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-05-12 08:52:30 +12:00
I simplified the UI for templates
This commit is contained in:
TheShadowOfHassen
parent
e04b148c57
commit
c2828a03b9
|
|
@ -84,7 +84,6 @@ class CharactersView:
|
|||
self.newTemplateEntryBuffer = builder.get_object("new_template_entry_buffer")
|
||||
self.charecterDetailsMenuAppendBox = builder.get_object("template_select_box")
|
||||
self.charecterDetailsMenuTemplateBox = builder.get_object("template_select_box2")
|
||||
self.characterDetaisMenuDeleteBox = builder.get_object("delete_select_box")
|
||||
self.detailsNameRenderer = builder.get_object("details_name")
|
||||
self.detailsValueRenderer = builder.get_object("details_value")
|
||||
|
||||
|
|
@ -340,27 +339,28 @@ class CharactersView:
|
|||
container.remove(d)
|
||||
clear_container( self.charecterDetailsMenuAppendBox)
|
||||
clear_container(self.charecterDetailsMenuTemplateBox)
|
||||
clear_container(self.characterDetaisMenuDeleteBox)
|
||||
for x in self.characterTemplates.templates:
|
||||
button = Gtk.Button(label=x,) # TODO: turn into ModelButton
|
||||
button.connect("clicked", self._appendTemplateClicked, x)
|
||||
self.charecterDetailsMenuAppendBox.add(button)
|
||||
# Now we do the buttons for charecterDetailsMenuTemplateBox
|
||||
button2 = Gtk.Button(label=x,) # TODO: turn into ModelButton
|
||||
button2.connect("clicked", self._updateTemplateClicked, x)
|
||||
self.charecterDetailsMenuTemplateBox.add(button2)
|
||||
# now we do delete templates
|
||||
box = Gtk.Box()
|
||||
label = Gtk.Label(label=x)
|
||||
box.pack_start(label, False, False, 0)
|
||||
button3 = Gtk.Button(label='delete') # TODO: Make this red
|
||||
button3.connect("clicked", self._deleteTemplateClicked, x)
|
||||
box.pack_start(button3, False, False, 0)
|
||||
self.characterDetaisMenuDeleteBox.add(box)
|
||||
overwrite_button = Gtk.Button()
|
||||
overwrite_button.add(Gtk.Image(icon_name='emblem-insync-syncing'))
|
||||
overwrite_button.connect("clicked", self._updateTemplateClicked, x)
|
||||
overwrite_button.set_tooltip_markup ('Overwrite template with text of current file') # TODO: This might be an issue when it comes to translating
|
||||
delete_button = Gtk.Button()
|
||||
delete_button.add(Gtk.Image(icon_name='app-remove-symbolic'))
|
||||
delete_button.set_tooltip_markup ('Delete') # TODO: This might be an issue when it comes to translating
|
||||
delete_button.connect("clicked", self._deleteTemplateClicked, x)
|
||||
box.pack_start(overwrite_button, False, False, 0)
|
||||
box.pack_start(delete_button, False, False, 0)
|
||||
self.charecterDetailsMenuTemplateBox.add(box)
|
||||
|
||||
self.charecterDetailsMenuAppendBox.show_all()
|
||||
self.charecterDetailsMenuTemplateBox.show_all()
|
||||
self.characterDetaisMenuDeleteBox.show_all()
|
||||
|
||||
def _onCharecterDetailsMenuClicked(self, button: Gtk.MenuButton):
|
||||
self._updateCharecterDetailsMenu()
|
||||
|
|
|
|||
|
|
@ -89,58 +89,6 @@ along with Manuskript. If not, see <http://www.gnu.org/licenses/>.
|
|||
<object class="GtkPopoverMenu" id="charecter_options_popover">
|
||||
<property name="height-request">200</property>
|
||||
<property name="can-focus">False</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="append_template_box">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="GtkModelButton">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">True</property>
|
||||
<property name="receives-default">True</property>
|
||||
<property name="text" translatable="yes">Append Template</property>
|
||||
<property name="menu-name">main</property>
|
||||
<property name="inverted">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkScrolledWindow">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">True</property>
|
||||
<property name="vexpand">True</property>
|
||||
<property name="shadow-type">in</property>
|
||||
<child>
|
||||
<object class="GtkViewport">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<child>
|
||||
<object class="GtkListBox" id="template_select_box">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="selection-mode">none</property>
|
||||
<property name="activate-on-single-click">False</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="submenu">append_template</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="edit_template_box">
|
||||
<property name="visible">True</property>
|
||||
|
|
@ -257,7 +205,7 @@ along with Manuskript. If not, see <http://www.gnu.org/licenses/>.
|
|||
<property name="visible">True</property>
|
||||
<property name="can-focus">True</property>
|
||||
<property name="receives-default">True</property>
|
||||
<property name="text" translatable="yes">Set info to template</property>
|
||||
<property name="text" translatable="yes">Mange Templates</property>
|
||||
<property name="menu-name">edit_template</property>
|
||||
</object>
|
||||
<packing>
|
||||
|
|
@ -267,18 +215,7 @@ along with Manuskript. If not, see <http://www.gnu.org/licenses/>.
|
|||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkModelButton">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">True</property>
|
||||
<property name="receives-default">True</property>
|
||||
<property name="text" translatable="yes">Delete Template</property>
|
||||
<property name="menu-name">delete_template</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">2</property>
|
||||
</packing>
|
||||
<placeholder/>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
|
|
@ -287,7 +224,10 @@ along with Manuskript. If not, see <http://www.gnu.org/licenses/>.
|
|||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="delete_template_box">
|
||||
<placeholder/>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="append_template_box">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="orientation">vertical</property>
|
||||
|
|
@ -296,7 +236,7 @@ along with Manuskript. If not, see <http://www.gnu.org/licenses/>.
|
|||
<property name="visible">True</property>
|
||||
<property name="can-focus">True</property>
|
||||
<property name="receives-default">True</property>
|
||||
<property name="text" translatable="yes">Delete Template</property>
|
||||
<property name="text" translatable="yes">Append Template</property>
|
||||
<property name="menu-name">main</property>
|
||||
<property name="inverted">True</property>
|
||||
</object>
|
||||
|
|
@ -317,7 +257,7 @@ along with Manuskript. If not, see <http://www.gnu.org/licenses/>.
|
|||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<child>
|
||||
<object class="GtkListBox" id="delete_select_box">
|
||||
<object class="GtkListBox" id="template_select_box">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="selection-mode">none</property>
|
||||
|
|
@ -335,8 +275,8 @@ along with Manuskript. If not, see <http://www.gnu.org/licenses/>.
|
|||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="submenu">delete_template</property>
|
||||
<property name="position">3</property>
|
||||
<property name="submenu">append_template</property>
|
||||
<property name="position">4</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Generated with glade 3.40.0 -->
|
||||
<interface>
|
||||
<requires lib="gtk+" version="3.24"/>
|
||||
<object class="GtkOverlay" id="quote_widget">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<child>
|
||||
<object class="GtkImage" id="artwork">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="index">-1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child type="overlay">
|
||||
<!-- n-columns=3 n-rows=3 -->
|
||||
<object class="GtkGrid" id="overlay_grid">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="can-default">True</property>
|
||||
<property name="margin-bottom">20</property>
|
||||
<property name="column-homogeneous">True</property>
|
||||
<child>
|
||||
<object class="GtkLabel" id="quote_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="label" translatable="yes">label</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left-attach">2</property>
|
||||
<property name="top-attach">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="source_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="label" translatable="yes">label</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left-attach">2</property>
|
||||
<property name="top-attach">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<placeholder/>
|
||||
</child>
|
||||
<child>
|
||||
<placeholder/>
|
||||
</child>
|
||||
<child>
|
||||
<placeholder/>
|
||||
</child>
|
||||
<child>
|
||||
<placeholder/>
|
||||
</child>
|
||||
<child>
|
||||
<placeholder/>
|
||||
</child>
|
||||
<child>
|
||||
<placeholder/>
|
||||
</child>
|
||||
<child>
|
||||
<placeholder/>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</interface>
|
||||
Loading…
Reference in a new issue