mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-05-07 22:42:26 +12:00
Adjust variable, layout, icon and alignment
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
This commit is contained in:
TheJackiMonster
parent
2ffa70b5dd
commit
b0d9ac29e7
|
|
@ -339,24 +339,24 @@ class CharactersView:
|
|||
container.remove(d)
|
||||
clear_container( self.charecterDetailsMenuAppendBox)
|
||||
clear_container(self.charecterDetailsMenuTemplateBox)
|
||||
for x in self.characterTemplates.templates:
|
||||
button = Gtk.Button(label=x,) # TODO: turn into ModelButton
|
||||
button.connect("clicked", self._appendTemplateClicked, x)
|
||||
for template_name in self.characterTemplates.templates:
|
||||
button = Gtk.Button(label=template_name) # TODO: turn into ModelButton
|
||||
button.connect("clicked", self._appendTemplateClicked, template_name)
|
||||
self.charecterDetailsMenuAppendBox.add(button)
|
||||
# Now we do the buttons for charecterDetailsMenuTemplateBox
|
||||
box = Gtk.Box()
|
||||
label = Gtk.Label(label=x)
|
||||
label = Gtk.Label(label=template_name)
|
||||
overwrite_button = Gtk.Button()
|
||||
overwrite_button.add(Gtk.Image(icon_name='system-restart-symbolic'))
|
||||
overwrite_button.connect("clicked", self._updateTemplateClicked, x)
|
||||
overwrite_button.add(Gtk.Image(icon_name='emblem-synchronizing-symbolic'))
|
||||
overwrite_button.connect("clicked", self._updateTemplateClicked, template_name)
|
||||
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.add(Gtk.Image(icon_name='list-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)
|
||||
box.pack_start(label, False, False, 0)
|
||||
delete_button.connect("clicked", self._deleteTemplateClicked, template_name)
|
||||
box.pack_end(delete_button, False, False, 0)
|
||||
box.pack_end(overwrite_button, False, False, 0)
|
||||
box.pack_start(label, True, False, 0)
|
||||
self.charecterDetailsMenuTemplateBox.add(box)
|
||||
|
||||
self.charecterDetailsMenuAppendBox.show_all()
|
||||
|
|
@ -365,19 +365,19 @@ class CharactersView:
|
|||
def _onCharecterDetailsMenuClicked(self, button: Gtk.MenuButton):
|
||||
self._updateCharecterDetailsMenu()
|
||||
|
||||
def _updateTemplateClicked(self, button: Gtk.ModelButton, template):
|
||||
def _updateTemplateClicked(self, button: Gtk.ModelButton, template_name):
|
||||
if self.character is None:
|
||||
return
|
||||
self.characterTemplates.templates[template] = self.character.details # TODO: Add A warning? Or should there be undo/ redo when revisions are written.
|
||||
self.characterTemplates.templates[template_name] = self.character.details # TODO: Add A warning? Or should there be undo/ redo when revisions are written.
|
||||
|
||||
def _deleteTemplateClicked(self, button: Gtk.ModelButton, template):
|
||||
del self.characterTemplates.templates[template]
|
||||
def _deleteTemplateClicked(self, button: Gtk.ModelButton, template_name):
|
||||
del self.characterTemplates.templates[template_name]
|
||||
self._updateCharecterDetailsMenu()
|
||||
|
||||
def _appendTemplateClicked(self, button: Gtk.ModelButton, template):
|
||||
def _appendTemplateClicked(self, button: Gtk.ModelButton, template_name):
|
||||
if self.character is None:
|
||||
return
|
||||
self.character.details.update(self.characterTemplates.templates[template])
|
||||
self.character.details.update(self.characterTemplates.templates[template_name])
|
||||
|
||||
# We have to reload the character
|
||||
self.loadCharacterData(self.character)
|
||||
|
|
|
|||
|
|
@ -87,100 +87,9 @@ along with Manuskript. If not, see <http://www.gnu.org/licenses/>.
|
|||
<object class="GtkEntryBuffer" id="name"/>
|
||||
<object class="GtkEntryBuffer" id="new_template_entry_buffer"/>
|
||||
<object class="GtkPopoverMenu" id="charecter_options_popover">
|
||||
<property name="height-request">200</property>
|
||||
<property name="width-request">350</property>
|
||||
<property name="height-request">250</property>
|
||||
<property name="can-focus">False</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="edit_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">Set info to 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_box2">
|
||||
<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>
|
||||
<child>
|
||||
<object class="GtkBox">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<child>
|
||||
<object class="GtkEntry" id="new_template_entry">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">True</property>
|
||||
<property name="buffer">new_template_entry_buffer</property>
|
||||
<property name="placeholder-text" translatable="yes">Enter a unique name</property>
|
||||
<property name="input-hints">GTK_INPUT_HINT_NO_EMOJI | GTK_INPUT_HINT_NONE</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkButton" id="new_template_button">
|
||||
<property name="label" translatable="yes">New template</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">True</property>
|
||||
<property name="receives-default">True</property>
|
||||
<property name="tooltip-text" translatable="yes">Adds a new template with the content of the current charecter's details.</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="submenu">edit_template</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="main_menu_box">
|
||||
<property name="visible">True</property>
|
||||
|
|
@ -220,12 +129,8 @@ along with Manuskript. If not, see <http://www.gnu.org/licenses/>.
|
|||
</object>
|
||||
<packing>
|
||||
<property name="submenu">main</property>
|
||||
<property name="position">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<placeholder/>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="append_template_box">
|
||||
<property name="visible">True</property>
|
||||
|
|
@ -251,6 +156,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="vexpand">True</property>
|
||||
<property name="border-width">4</property>
|
||||
<property name="shadow-type">in</property>
|
||||
<child>
|
||||
<object class="GtkViewport">
|
||||
|
|
@ -276,7 +182,111 @@ along with Manuskript. If not, see <http://www.gnu.org/licenses/>.
|
|||
</object>
|
||||
<packing>
|
||||
<property name="submenu">append_template</property>
|
||||
<property name="position">4</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="edit_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">Set info to 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="border-width">4</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_box2">
|
||||
<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>
|
||||
<child>
|
||||
<object class="GtkBox">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="margin-start">4</property>
|
||||
<property name="margin-end">4</property>
|
||||
<property name="margin-bottom">4</property>
|
||||
<property name="spacing">4</property>
|
||||
<child>
|
||||
<object class="GtkEntry" id="new_template_entry">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">True</property>
|
||||
<property name="buffer">new_template_entry_buffer</property>
|
||||
<property name="placeholder-text" translatable="yes">Enter a unique name</property>
|
||||
<property name="input-hints">GTK_INPUT_HINT_NO_EMOJI | GTK_INPUT_HINT_NONE</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkButton" id="new_template_button">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">True</property>
|
||||
<property name="receives-default">True</property>
|
||||
<property name="tooltip-text" translatable="yes">Adds a new template with the content of the current charecter's details.</property>
|
||||
<child>
|
||||
<object class="GtkImage">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="icon-name">list-add-symbolic</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="pack-type">end</property>
|
||||
<property name="position">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="submenu">edit_template</property>
|
||||
<property name="position">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
|
|
|
|||
Loading…
Reference in a new issue