Verified Kaydet (Commit) 0c570797 authored tarafından Erdem Ersoy's avatar Erdem Ersoy

Some changes:

* Fix installing via setup.py
* Add confirmation dialog before (un)installing
* Update message dialog titles
* Make message dialog titles translatable
üst d6b4d60f
build/
dist/
Pardus_Flatpak_GUI.egg-info/
pardusflatpakgui/__pycache__/ pardusflatpakgui/__pycache__/
*.po~ *.po~
*.glade~ *.glade~
......
This diff is collapsed.
...@@ -44,8 +44,7 @@ class MainWindow(object): ...@@ -44,8 +44,7 @@ class MainWindow(object):
self.Application = application self.Application = application
try: try:
main_gui_file = "ui/mainwindow.glade" main_gui_file = "/usr/share/pardus/pardus-flatpak-gui/ui/mainwindow.glade"
# main_gui_file = "/usr/share/pardus/pardus-flatpak-gui/ui/mainwindow.glade"
main_builder = Gtk.Builder.new_from_file(main_gui_file) main_builder = Gtk.Builder.new_from_file(main_gui_file)
main_builder.connect_signals(self) main_builder.connect_signals(self)
except GLib.GError: except GLib.GError:
...@@ -91,6 +90,10 @@ class MainWindow(object): ...@@ -91,6 +90,10 @@ class MainWindow(object):
self.ListStoreMain = main_builder.get_object("ListStoreMain") self.ListStoreMain = main_builder.get_object("ListStoreMain")
self.MessageDialogError = messages_builder.get_object("MessageDialogError") self.MessageDialogError = messages_builder.get_object("MessageDialogError")
self.MessageDialogError.set_title(_("Pardus Flatpak GUI Error Dialog"))
self.MessageDialogQuestion = messages_builder.get_object("MessageDialogQuestion")
self.MessageDialogQuestion.set_title(_("Pardus Flatpak GUI Question Dialog"))
# Debug print()'s: # Debug print()'s:
# print("self.FlatHubRefsList:", len(self.FlatHubRefsList)) # print("self.FlatHubRefsList:", len(self.FlatHubRefsList))
...@@ -609,10 +612,21 @@ class MainWindow(object): ...@@ -609,10 +612,21 @@ class MainWindow(object):
real_name = tree_model.get_value(tree_iter, 0) real_name = tree_model.get_value(tree_iter, 0)
arch = tree_model.get_value(tree_iter, 1) arch = tree_model.get_value(tree_iter, 1)
branch = tree_model.get_value(tree_iter, 2) branch = tree_model.get_value(tree_iter, 2)
name = tree_model.get_value(tree_iter, 6)
UninstallWindow(self.Application, self.FlatpakInstallation, real_name,
arch, branch, tree_model, tree_iter, selection, self.SearchFilter, self.HeaderBarShowButton, self.MessageDialogQuestion.set_markup(
button_not_pressed_already) _("<big><b>Uninstalling ") + name + "(" + real_name + ")" + "</b></big>")
self.MessageDialogQuestion.format_secondary_text(
_("Are you sure to uninstall ") + name + "?")
answer = self.MessageDialogQuestion.run()
self.MessageDialogQuestion.hide()
if answer == Gtk.ResponseType.YES:
UninstallWindow(self.Application, self.FlatpakInstallation, real_name,
arch, branch, tree_model, tree_iter, selection, self.SearchFilter, self.HeaderBarShowButton,
button_not_pressed_already)
elif answer == Gtk.ResponseType.NO:
return None
def on_install(self, menu_item): def on_install(self, menu_item):
selection = self.TreeViewMain.get_selection() selection = self.TreeViewMain.get_selection()
...@@ -631,8 +645,18 @@ class MainWindow(object): ...@@ -631,8 +645,18 @@ class MainWindow(object):
branch = tree_model.get_value(tree_iter, 2) branch = tree_model.get_value(tree_iter, 2)
remote = tree_model.get_value(tree_iter, 3) remote = tree_model.get_value(tree_iter, 3)
InstallWindow(self.Application, self.FlatpakInstallation, real_name, arch, branch, self.MessageDialogQuestion.set_markup(
remote, tree_model, tree_iter, selection, self.SearchFilter) _("<big><b>Installing ") + real_name + "</b></big>")
self.MessageDialogQuestion.format_secondary_text(
_("Are you sure to install ") + real_name + "?")
answer = self.MessageDialogQuestion.run()
self.MessageDialogQuestion.hide()
if answer == Gtk.ResponseType.YES:
InstallWindow(self.Application, self.FlatpakInstallation, real_name, arch, branch,
remote, tree_model, tree_iter, selection, self.SearchFilter)
elif answer == Gtk.ResponseType.NO:
return None
def on_update_all(self, menu_item): def on_update_all(self, menu_item):
UpdateAllWindow.at_updating = True UpdateAllWindow.at_updating = True
......
...@@ -30,7 +30,7 @@ Author: Erdem Ersoy ...@@ -30,7 +30,7 @@ Author: Erdem Ersoy
<!-- interface-authors Erdem Ersoy --> <!-- interface-authors Erdem Ersoy -->
<object class="GtkMessageDialog" id="MessageDialogError"> <object class="GtkMessageDialog" id="MessageDialogError">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="title" translatable="yes">Flatpak GUI Error</property> <property name="title" translatable="yes">Pardus Flatpak GUI Error Dialog</property>
<property name="resizable">False</property> <property name="resizable">False</property>
<property name="modal">True</property> <property name="modal">True</property>
<property name="icon_name">dialog-error</property> <property name="icon_name">dialog-error</property>
...@@ -71,4 +71,42 @@ Author: Erdem Ersoy ...@@ -71,4 +71,42 @@ Author: Erdem Ersoy
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="stock">gtk-dialog-error</property> <property name="stock">gtk-dialog-error</property>
</object> </object>
<object class="GtkMessageDialog" id="MessageDialogQuestion">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Pardus Flatpak GUI Question Dialog</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="icon_name">dialog-information</property>
<property name="type_hint">dialog</property>
<property name="message_type">question</property>
<property name="buttons">yes-no</property>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
<property name="homogeneous">True</property>
<property name="layout_style">end</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
</object>
</interface> </interface>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment