Skip to content

P
pardus-flatpak-gui
Verified Kaydet (Commit) 6da6663c authored tarafından Erdem Ersoy's avatar Erdem Ersoy
Dosyalara gözat
Seçenekler

Some changes: 

* Divide menu to two separate menu
* Fix actions (1/X)
üst 4e963178
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 82 deletions
pardus-flatpak-gui.pot
Dosyayı görüntüle @ 6da6663c
This diff is collapsed.
pardusflatpakgui/mainwindow.py
Dosyayı görüntüle @ 6da6663c
......@@ -197,6 +197,8 @@ class MainWindow(object):
self.HeaderBarShowButton = MainBuilder.get_object("HeaderBarShowButton")
self.HeaderBarShowButton.set_label(_("Show Installed Apps"))
self.ActionsMenu = MainBuilder.get_object("ActionsMenu")
self.AboutDialog = AboutBuilder.get_object("AboutDialog")
self.AboutDialog.set_comments(_("Flatpak GUI for Pardus"))
self.AboutDialog.set_copyright(_("Copyright (C) 2020 Erdem Ersoy"))
......@@ -303,6 +305,9 @@ class MainWindow(object):
def onPressShowButton(self, toggle_button):
self.SearchFilter.refilter()
def onShowActionsMenu(self, tree_view, path, column):
self.ActionsMenu.popup_at_pointer(None)
def onRun(self, menuitem):
Selection = self.TreeViewMain.get_selection()
TreeModel, TreeIter = Selection.get_selected()
......@@ -317,9 +322,9 @@ class MainWindow(object):
TreePath = TreeModel.get_path(TreeIter)
SelectedRowIndex = TreePath.get_indices()[0]
AppToRunRealName = self.ListStoreMain.get_value(TreeIter, 0)
AppToRunArch = self.ListStoreMain.get_value(TreeIter, 1)
AppToRunBranch = self.ListStoreMain.get_value(TreeIter, 2)
AppToRunRealName = TreeModel.get_value(TreeIter, 0)
AppToRunArch = TreeModel.get_value(TreeIter, 1)
AppToRunBranch = TreeModel.get_value(TreeIter, 2)
AppToRun = Flatpak.Ref.parse("app/" + AppToRunRealName + "/" +
AppToRunArch + "/" + AppToRunBranch)
......@@ -367,9 +372,9 @@ class MainWindow(object):
self.FlatHubRefsList.remove(item2)
self.FlatpakRefsList = self.FlatpakRefsList + self.FlatHubRefsList
AppRealName = self.ListStoreMain.get_value(TreeIter, 0)
AppArch = self.ListStoreMain.get_value(TreeIter, 1)
AppBranch = self.ListStoreMain.get_value(TreeIter, 2)
AppRealName = TreeModel.get_value(TreeIter, 0)
AppArch = TreeModel.get_value(TreeIter, 1)
AppBranch = TreeModel.get_value(TreeIter, 2)
for item in self.FlatpakRefsList:
if item.get_name() == AppRealName:
......@@ -516,9 +521,9 @@ class MainWindow(object):
TreePath = TreeModel.get_path(TreeIter)
SelectedRowIndex = TreePath.get_indices()[0]
AppToUninstallRealName = self.ListStoreMain.get_value(TreeIter, 0)
AppToUninstallArch = self.ListStoreMain.get_value(TreeIter, 1)
AppToUninstallBranch = self.ListStoreMain.get_value(TreeIter, 2)
AppToUninstallRealName = TreeModel.get_value(TreeIter, 0)
AppToUninstallArch = TreeModel.get_value(TreeIter, 1)
AppToUninstallBranch = TreeModel.get_value(TreeIter, 2)
self.FlatHubRefsList = self.FlatpakInstallation.list_remote_refs_sync(
"flathub", Gio.Cancellable.new())
......@@ -546,10 +551,10 @@ class MainWindow(object):
TreePath = TreeModel.get_path(TreeIter)
SelectedRowIndex = TreePath.get_indices()[0]
AppToInstallRealName = self.ListStoreMain.get_value(TreeIter, 0)
AppToInstallArch = self.ListStoreMain.get_value(TreeIter, 1)
AppToInstallBranch = self.ListStoreMain.get_value(TreeIter, 2)
AppToInstallRemote = self.ListStoreMain.get_value(TreeIter, 3)
AppToInstallRealName = TreeModel.get_value(TreeIter, 0)
AppToInstallArch = TreeModel.get_value(TreeIter, 1)
AppToInstallBranch = TreeModel.get_value(TreeIter, 2)
AppToInstallRemote = TreeModel.get_value(TreeIter, 3)
for item in self.FlatpakRefsList:
if item.get_name() == AppToInstallRealName and item not in self.FlatHubRefsList:
......
ui/mainwindow.glade
Dosyayı görüntüle @ 6da6663c
......@@ -33,67 +33,7 @@ Author: Erdem Ersoy
<property name="can_focus">False</property>
<property name="stock">gtk-about</property>
</object>
<object class="GtkImage" id="InfoImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-info</property>
</object>
<object class="GtkImage" id="InstallFromEntryImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-save</property>
</object>
<object class="GtkImage" id="InstallFromFileImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-save</property>
</object>
<object class="GtkImage" id="InstallImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-save</property>
</object>
<object class="GtkListStore" id="ListStoreMain">
<columns>
<!-- column-name RealName -->
<column type="gchararray"/>
<!-- column-name Arch -->
<column type="gchararray"/>
<!-- column-name Branch -->
<column type="gchararray"/>
<!-- column-name RemoteName -->
<column type="gchararray"/>
<!-- column-name InstalledSize -->
<column type="gchararray"/>
<!-- column-name DownloadSize -->
<column type="gchararray"/>
<!-- column-name Name -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkTreeModelFilter" id="SearchFilter">
<property name="child_model">ListStoreMain</property>
</object>
<object class="GtkTreeModelSort" id="SortModel">
<property name="model">SearchFilter</property>
<signal name="sort-column-changed" handler="onResorted" swapped="no"/>
</object>
<object class="GtkImage" id="RunImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-execute</property>
</object>
<object class="GtkImage" id="UninstallImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-remove</property>
</object>
<object class="GtkImage" id="UpdateAllImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-up</property>
</object>
<object class="GtkMenu" id="HeaderBarMenu">
<object class="GtkMenu" id="ActionsMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
......@@ -130,7 +70,7 @@ Author: Erdem Ersoy
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="Separator1MenuItem">
<object class="GtkSeparatorMenuItem" id="ActionsSeparatorMenuItem">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
......@@ -168,12 +108,70 @@ Author: Erdem Ersoy
<signal name="activate" handler="onInstallFromFile" swapped="no"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="Separator2MenuItem">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
</object>
<object class="GtkImage" id="InfoImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-info</property>
</object>
<object class="GtkImage" id="InstallFromEntryImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-save</property>
</object>
<object class="GtkImage" id="InstallFromFileImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-save</property>
</object>
<object class="GtkImage" id="InstallImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-save</property>
</object>
<object class="GtkListStore" id="ListStoreMain">
<columns>
<!-- column-name RealName -->
<column type="gchararray"/>
<!-- column-name Arch -->
<column type="gchararray"/>
<!-- column-name Branch -->
<column type="gchararray"/>
<!-- column-name RemoteName -->
<column type="gchararray"/>
<!-- column-name InstalledSize -->
<column type="gchararray"/>
<!-- column-name DownloadSize -->
<column type="gchararray"/>
<!-- column-name Name -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkTreeModelFilter" id="SearchFilter">
<property name="child_model">ListStoreMain</property>
</object>
<object class="GtkTreeModelSort" id="SortModel">
<property name="model">SearchFilter</property>
<signal name="sort-column-changed" handler="onResorted" swapped="no"/>
</object>
<object class="GtkImage" id="RunImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-execute</property>
</object>
<object class="GtkImage" id="UninstallImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-remove</property>
</object>
<object class="GtkImage" id="UpdateAllImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-up</property>
</object>
<object class="GtkMenu" id="HeaderBarMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="UpdateAllMenuItem">
<property name="label" translatable="yes">Up_date All</property>
......@@ -186,7 +184,7 @@ Author: Erdem Ersoy
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="Separator3MenuItem">
<object class="GtkSeparatorMenuItem" id="HeaderSeparatorMenuItem">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
......@@ -266,6 +264,7 @@ Author: Erdem Ersoy
<property name="reorderable">True</property>
<property name="search_column">0</property>
<property name="activate_on_single_click">True</property>
<signal name="row-activated" handler="onShowActionsMenu" swapped="no"/>
<child internal-child="selection">
<object class="GtkTreeSelection">
<signal name="changed" handler="onSelectionChanged" swapped="no"/>
......
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