Rewrite Flatpak GUI mess (3/X):

* Rename/refactor mainwindow.py methods

pardus-flatpak-gui.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-17 11:48+0300\n"
+"POT-Creation-Date: 2020-04-17 12:12+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: pardusflatpakgui/flatpakguiapp.py:49
 #: pardusflatpakgui/installfromentrywindow.py:61
-#: pardusflatpakgui/mainwindow.py:69
+#: pardusflatpakgui/mainwindow.py:70
 msgid "Error reading message dialogs GUI file: "
 msgstr ""
 
@@ -52,7 +52,7 @@ msgstr ""
 #: pardusflatpakgui/installfromentrywindow.py:53
 #: pardusflatpakgui/installfromfilewindow_2.py:73
 #: pardusflatpakgui/installfromfilewindow.py:48
-#: pardusflatpakgui/installwindow.py:85 pardusflatpakgui/mainwindow.py:53
+#: pardusflatpakgui/installwindow.py:85 pardusflatpakgui/mainwindow.py:54
 #: pardusflatpakgui/uninstallwindow.py:77
 #: pardusflatpakgui/updateallwindow.py:69
 msgid "Error reading GUI file: "
@@ -113,7 +113,7 @@ msgstr ""
 
 #: pardusflatpakgui/installfromentrywindow.py:80
 #: pardusflatpakgui/installfromfilewindow.py:66
-#: pardusflatpakgui/mainwindow.py:166
+#: pardusflatpakgui/mainwindow.py:168
 msgid "I_nstall"
 msgstr ""
 
@@ -142,216 +142,216 @@ msgstr ""
 msgid "Choose a file"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:61
+#: pardusflatpakgui/mainwindow.py:62
 msgid "Error reading About dialog GUI file: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:135
+#: pardusflatpakgui/mainwindow.py:137
 msgid "<big><b>Invalid Flatpak Reference Error</b></big>"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:137
+#: pardusflatpakgui/mainwindow.py:139
 msgid "Invalid Flatpak reference is: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:153 pardusflatpakgui/mainwindow.py:222
+#: pardusflatpakgui/mainwindow.py:155 pardusflatpakgui/mainwindow.py:224
 msgid "Pardus Flatpak GUI"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:154
+#: pardusflatpakgui/mainwindow.py:156
 msgid "Manage Flatpak softwares via GUI on Pardus"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:157
+#: pardusflatpakgui/mainwindow.py:159
 msgid "_Run"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:160
+#: pardusflatpakgui/mainwindow.py:162
 msgid "_Info"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:163
+#: pardusflatpakgui/mainwindow.py:165
 msgid "_Uninstall"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:172
+#: pardusflatpakgui/mainwindow.py:174
 msgid "Install From _File"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:175
+#: pardusflatpakgui/mainwindow.py:177
 msgid "Install From _Entry"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:178
+#: pardusflatpakgui/mainwindow.py:180
 msgid "_Update All"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:181
+#: pardusflatpakgui/mainwindow.py:183
 msgid "_About"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:185
+#: pardusflatpakgui/mainwindow.py:187
 msgid "Real Name"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:188
+#: pardusflatpakgui/mainwindow.py:190
 msgid "Arch"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:191
+#: pardusflatpakgui/mainwindow.py:193
 msgid "Branch"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:195
+#: pardusflatpakgui/mainwindow.py:197
 msgid "Remote Name"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:199
+#: pardusflatpakgui/mainwindow.py:201
 msgid "Installed Size"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:203
+#: pardusflatpakgui/mainwindow.py:205
 msgid "Download Size"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:206
+#: pardusflatpakgui/mainwindow.py:208
 msgid "Name"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:211
+#: pardusflatpakgui/mainwindow.py:213
 msgid "Click here for search"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:217
+#: pardusflatpakgui/mainwindow.py:219
 msgid "Show Installed Apps"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:220
+#: pardusflatpakgui/mainwindow.py:222
 msgid "Flatpak GUI for Pardus"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:221
+#: pardusflatpakgui/mainwindow.py:223
 msgid "Copyright (C) 2020 Erdem Ersoy"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:224
+#: pardusflatpakgui/mainwindow.py:226
 msgid "Pardus Flatpak GUI Web Site"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:288 pardusflatpakgui/mainwindow.py:328
-#: pardusflatpakgui/mainwindow.py:487 pardusflatpakgui/mainwindow.py:519
+#: pardusflatpakgui/mainwindow.py:291 pardusflatpakgui/mainwindow.py:331
+#: pardusflatpakgui/mainwindow.py:490 pardusflatpakgui/mainwindow.py:522
 msgid "<big><b>Selection Error</b></big>"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:290 pardusflatpakgui/mainwindow.py:330
-#: pardusflatpakgui/mainwindow.py:489 pardusflatpakgui/mainwindow.py:521
+#: pardusflatpakgui/mainwindow.py:293 pardusflatpakgui/mainwindow.py:333
+#: pardusflatpakgui/mainwindow.py:492 pardusflatpakgui/mainwindow.py:524
 msgid "None of the applications are selected."
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:317
+#: pardusflatpakgui/mainwindow.py:320
 msgid "<big><b>Running Error</b></big>"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:319
+#: pardusflatpakgui/mainwindow.py:322
 msgid "The selected application couldn't run."
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:358 pardusflatpakgui/mainwindow.py:375
-#: pardusflatpakgui/mainwindow.py:379 pardusflatpakgui/mainwindow.py:383
-#: pardusflatpakgui/mainwindow.py:387 pardusflatpakgui/mainwindow.py:391
-#: pardusflatpakgui/mainwindow.py:395 pardusflatpakgui/mainwindow.py:399
-#: pardusflatpakgui/mainwindow.py:413 pardusflatpakgui/mainwindow.py:417
-#: pardusflatpakgui/mainwindow.py:421 pardusflatpakgui/mainwindow.py:454
-#: pardusflatpakgui/mainwindow.py:458 pardusflatpakgui/mainwindow.py:466
+#: pardusflatpakgui/mainwindow.py:361 pardusflatpakgui/mainwindow.py:378
+#: pardusflatpakgui/mainwindow.py:382 pardusflatpakgui/mainwindow.py:386
+#: pardusflatpakgui/mainwindow.py:390 pardusflatpakgui/mainwindow.py:394
+#: pardusflatpakgui/mainwindow.py:398 pardusflatpakgui/mainwindow.py:402
+#: pardusflatpakgui/mainwindow.py:416 pardusflatpakgui/mainwindow.py:420
+#: pardusflatpakgui/mainwindow.py:424 pardusflatpakgui/mainwindow.py:457
+#: pardusflatpakgui/mainwindow.py:461 pardusflatpakgui/mainwindow.py:469
 msgid "None"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:407 pardusflatpakgui/mainwindow.py:433
-#: pardusflatpakgui/mainwindow.py:473
+#: pardusflatpakgui/mainwindow.py:410 pardusflatpakgui/mainwindow.py:436
+#: pardusflatpakgui/mainwindow.py:476
 msgid "Yes"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:409
+#: pardusflatpakgui/mainwindow.py:412
 msgid "No"
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:428 pardusflatpakgui/mainwindow.py:468
+#: pardusflatpakgui/mainwindow.py:431 pardusflatpakgui/mainwindow.py:471
 msgid "Real Name: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:429 pardusflatpakgui/mainwindow.py:469
+#: pardusflatpakgui/mainwindow.py:432 pardusflatpakgui/mainwindow.py:472
 msgid "Arch: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:430 pardusflatpakgui/mainwindow.py:470
+#: pardusflatpakgui/mainwindow.py:433 pardusflatpakgui/mainwindow.py:473
 msgid "Branch: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:431 pardusflatpakgui/mainwindow.py:471
+#: pardusflatpakgui/mainwindow.py:434 pardusflatpakgui/mainwindow.py:474
 msgid "Collection ID: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:432 pardusflatpakgui/mainwindow.py:472
+#: pardusflatpakgui/mainwindow.py:435 pardusflatpakgui/mainwindow.py:475
 msgid "Commit: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:433 pardusflatpakgui/mainwindow.py:473
+#: pardusflatpakgui/mainwindow.py:436 pardusflatpakgui/mainwindow.py:476
 msgid "Is Installed: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:434
+#: pardusflatpakgui/mainwindow.py:437
 msgid "License: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:435
+#: pardusflatpakgui/mainwindow.py:438
 msgid "Name: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:436
+#: pardusflatpakgui/mainwindow.py:439
 msgid "Summary: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:437
+#: pardusflatpakgui/mainwindow.py:440
 msgid "Version: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:438
+#: pardusflatpakgui/mainwindow.py:441
 msgid "Deploy Dir: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:439 pardusflatpakgui/mainwindow.py:475
+#: pardusflatpakgui/mainwindow.py:442 pardusflatpakgui/mainwindow.py:478
 msgid "EOL Reason: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:440 pardusflatpakgui/mainwindow.py:476
+#: pardusflatpakgui/mainwindow.py:443 pardusflatpakgui/mainwindow.py:479
 msgid "EOL Rebased: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:441 pardusflatpakgui/mainwindow.py:477
+#: pardusflatpakgui/mainwindow.py:444 pardusflatpakgui/mainwindow.py:480
 msgid "Installed Size: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:442
+#: pardusflatpakgui/mainwindow.py:445
 msgid "Is Current: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:443
+#: pardusflatpakgui/mainwindow.py:446
 msgid "Latest Commit: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:444
+#: pardusflatpakgui/mainwindow.py:447
 msgid "Origin: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:445
+#: pardusflatpakgui/mainwindow.py:448
 msgid "Subpaths: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:474
+#: pardusflatpakgui/mainwindow.py:477
 msgid "Download Size: "
 msgstr ""
 
-#: pardusflatpakgui/mainwindow.py:478
+#: pardusflatpakgui/mainwindow.py:481
 msgid "Remote Name: "
 msgstr ""
 

pardusflatpakgui/mainwindow.py

@@ -28,6 +28,7 @@ import gettext
 import locale
 import sys
 import gi
+
 gi.require_version('Gtk', '3.0')
 gi.require_version('GLib', '2.0')
 gi.require_version('Flatpak', '1.0')
@@ -91,10 +92,11 @@ class MainWindow(object):
 
         self.MessageDialogError = messages_builder.get_object("MessageDialogError")
 
-        print("self.FlatHubRefsList:", len(self.FlatHubRefsList))
-        print("self.InstalledRefsList:", len(self.InstalledRefsList))
-        print("self.NonInstalledRefsList:", len(self.NonInstalledRefsList))
-        print("self.AllRefsList:", len(self.AllRefsList))
+        # Debug print()'s:
+        # print("self.FlatHubRefsList:", len(self.FlatHubRefsList))
+        # print("self.InstalledRefsList:", len(self.InstalledRefsList))
+        # print("self.NonInstalledRefsList:", len(self.NonInstalledRefsList))
+        # print("self.AllRefsList:", len(self.AllRefsList))
 
         for item in self.AllRefsList:
             if item.get_kind() == Flatpak.RefKind.APP and \
@@ -211,7 +213,7 @@ class MainWindow(object):
         self.SearchEntryMain.set_placeholder_text(_("Click here for search"))
 
         self.SearchFilter = main_builder.get_object("SearchFilter")
-        self.SearchFilter.set_visible_func(self.SearchFilterFunction)
+        self.SearchFilter.set_visible_func(self.search_filter_function)
 
         self.HeaderBarShowButton = main_builder.get_object("HeaderBarShowButton")
         self.HeaderBarShowButton.set_label(_("Show Installed Apps"))
@@ -227,40 +229,41 @@ class MainWindow(object):
         self.MainWindow.set_application(application)
         self.MainWindow.show()
 
-    def SearchFilterFunction(self, model, iteration, data):
+    def search_filter_function(self, model, iteration, data):
         search_entry_text = self.SearchEntryMain.get_text()
         real_name = model[iteration][0]
         name = model[iteration][6]
 
-        if name == "":
-            is_installed = False
-        else:
+        # If a reference is installed
+        if model[iteration][5] != "":
             is_installed = True
+        else:
+            is_installed = False
 
         if len(search_entry_text) == 0 and not self.HeaderBarShowButton.get_active():
             return True
         if len(search_entry_text) == 0 and self.HeaderBarShowButton.get_active():
             return is_installed
-        elif (real_name.lower().count(search_entry_text.lower()) > 0 or name.lower().count(search_entry_text.lower()) > 0) \
-          and not self.HeaderBarShowButton.get_active():
+        elif (real_name.lower().count(search_entry_text.lower()) > 0 or name.lower().count(
+          search_entry_text.lower()) > 0) and not self.HeaderBarShowButton.get_active():
             return True
-        elif (real_name.lower().count(search_entry_text.lower()) > 0 or name.lower().count(search_entry_text.lower()) > 0) \
-          and self.HeaderBarShowButton.get_active():
+        elif (real_name.lower().count(search_entry_text.lower()) > 0 or name.lower().count(
+           search_entry_text.lower()) > 0) and self.HeaderBarShowButton.get_active():
             return is_installed
         else:
             return False
 
-    def onDestroy(self, *args):
+    def on_delete_main_window(self, widget, event):
         self.MainWindow.destroy()
 
-    def onSelectionChanged(self, treeselection):
-        Selection = self.TreeViewMain.get_selection()
-        TreeModel, TreeIter = Selection.get_selected()
-        if TreeIter is None:
+    def on_selection_changed(self, tree_selection):
+        selection = self.TreeViewMain.get_selection()
+        tree_model, tree_iter = selection.get_selected()
+        if tree_iter is None:
             return None
 
         # If the selected app is installed
-        if TreeModel.get_value(TreeIter, 5) == "":
+        if tree_model.get_value(tree_iter, 5) == "":
             self.RunMenuItem.set_sensitive(True)
             self.UninstallMenuItem.set_sensitive(True)
             self.InstallMenuItem.set_sensitive(False)
@@ -271,10 +274,10 @@ class MainWindow(object):
             self.UninstallMenuItem.set_sensitive(False)
             self.InstallMenuItem.set_sensitive(True)
 
-    def onSearchChanged(self, search_entry):
+    def on_search_changed(self, search_entry):
         self.SearchFilter.refilter()
 
-    def onPressShowButton(self, toggle_button):
+    def on_press_show_button(self, toggle_button):
         self.SearchFilter.refilter()
 
     def onShowActionsMenu(self, tree_view, path, column):

ui/mainwindow.glade

@@ -197,7 +197,7 @@ Author: Erdem Ersoy
     <property name="default_height">480</property>
     <property name="icon_name">applications-system</property>
     <property name="show_menubar">False</property>
-    <signal name="destroy" handler="onDestroy" swapped="no"/>
+    <signal name="delete-event" handler="on_delete_main_window" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="HeaderBarMain">
         <property name="visible">True</property>
@@ -226,7 +226,7 @@ Author: Erdem Ersoy
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <signal name="toggled" handler="onPressShowButton" swapped="no"/>
+            <signal name="toggled" handler="on_press_show_button" swapped="no"/>
           </object>
           <packing>
             <property name="pack_type">end</property>
@@ -255,8 +255,8 @@ Author: Erdem Ersoy
                 <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"/>
+                  <object class="GtkTreeSelection" id="TreeSelectionMain">
+                    <signal name="changed" handler="on_selection_changed" swapped="no"/>
                   </object>
                 </child>
                 <child>
@@ -371,7 +371,7 @@ Author: Erdem Ersoy
             <property name="primary_icon_activatable">False</property>
             <property name="primary_icon_sensitive">False</property>
             <property name="placeholder_text" translatable="yes">Click for search</property>
-            <signal name="search-changed" handler="onSearchChanged" swapped="no"/>
+            <signal name="search-changed" handler="on_search_changed" swapped="no"/>
           </object>
           <packing>
             <property name="left_attach">0</property>