Some changes:

- Refactor window/class names for prevent misunderstooding
- Improve installing messages a bit

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-13 14:06+0300\n"
+"POT-Creation-Date: 2020-04-13 16:16+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"
@@ -18,7 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: pardusflatpakgui/flatpakguiapp.py:49
-#: pardusflatpakgui/installinputwindow.py:57 pardusflatpakgui/mainwindow.py:69
+#: pardusflatpakgui/installfromentrywindow.py:57
+#: pardusflatpakgui/mainwindow.py:69
 msgid "Error reading message dialogs GUI file: "
 msgstr ""
 
@@ -46,11 +47,12 @@ msgstr ""
 msgid "There are too many arguments. Argument count: "
 msgstr ""
 
-#: pardusflatpakgui/infowindow.py:45 pardusflatpakgui/installdirectwindow.py:77
-#: pardusflatpakgui/installfromfileinputwindow.py:48
-#: pardusflatpakgui/installfromfilewindow.py:73
-#: pardusflatpakgui/installinputwindow.py:49
-#: pardusflatpakgui/installwindow.py:72 pardusflatpakgui/mainwindow.py:53
+#: pardusflatpakgui/infowindow.py:45
+#: pardusflatpakgui/installfromentrywindow_2.py:72
+#: pardusflatpakgui/installfromentrywindow.py:49
+#: pardusflatpakgui/installfromfilewindow_2.py:73
+#: pardusflatpakgui/installfromfilewindow.py:48
+#: pardusflatpakgui/installwindow.py:77 pardusflatpakgui/mainwindow.py:53
 #: pardusflatpakgui/uninstallwindow.py:69
 #: pardusflatpakgui/updateallwindow.py:57
 msgid "Error reading GUI file: "
@@ -64,75 +66,79 @@ msgstr ""
 msgid "Info About "
 msgstr ""
 
-#: pardusflatpakgui/installdirectwindow.py:82
-#: pardusflatpakgui/installdirectwindow.py:95
-#: pardusflatpakgui/installdirectwindow.py:189
-#: pardusflatpakgui/installfromfilewindow.py:191
-#: pardusflatpakgui/installwindow.py:77 pardusflatpakgui/installwindow.py:90
-#: pardusflatpakgui/installwindow.py:184
-msgid "Installing: "
+#: pardusflatpakgui/installfromentrywindow_2.py:77
+#: pardusflatpakgui/installfromentrywindow_2.py:90
+#: pardusflatpakgui/installwindow.py:82 pardusflatpakgui/installwindow.py:95
+msgid "Installing..."
 msgstr ""
 
-#: pardusflatpakgui/installdirectwindow.py:118
-#: pardusflatpakgui/installfromfilewindow.py:116
-#: pardusflatpakgui/installwindow.py:113
+#: pardusflatpakgui/installfromentrywindow_2.py:113
+#: pardusflatpakgui/installfromfilewindow_2.py:116
+#: pardusflatpakgui/installwindow.py:118
 msgid "Error at installation!"
 msgstr ""
 
-#: pardusflatpakgui/installdirectwindow.py:127
-#: pardusflatpakgui/installfromfilewindow.py:125
-#: pardusflatpakgui/installwindow.py:122
+#: pardusflatpakgui/installfromentrywindow_2.py:122
+#: pardusflatpakgui/installfromfilewindow_2.py:125
+#: pardusflatpakgui/installwindow.py:127
 msgid "Installing completed!"
 msgstr ""
 
-#: pardusflatpakgui/installdirectwindow.py:211
-#: pardusflatpakgui/installfromfilewindow.py:213
-#: pardusflatpakgui/installwindow.py:206
+#: pardusflatpakgui/installfromentrywindow_2.py:184
+#: pardusflatpakgui/installfromfilewindow_2.py:191
+#: pardusflatpakgui/installwindow.py:189
+msgid "Installing: "
+msgstr ""
+
+#: pardusflatpakgui/installfromentrywindow_2.py:206
+#: pardusflatpakgui/installfromfilewindow_2.py:213
+#: pardusflatpakgui/installwindow.py:211
 msgid "Not installed: "
 msgstr ""
 
-#: pardusflatpakgui/installfromfileinputwindow.py:55
-msgid "Please choose a Flatpak reference file."
+#: pardusflatpakgui/installfromentrywindow.py:67
+msgid ""
+"Please enter an application name (Ex: org.libreoffice.LibreOffice) what you "
+"want to install from Flathub."
 msgstr ""
 
-#: pardusflatpakgui/installfromfileinputwindow.py:61
-#: pardusflatpakgui/installinputwindow.py:72
+#: pardusflatpakgui/installfromentrywindow.py:72
+#: pardusflatpakgui/installfromfilewindow.py:61
 msgid ""
 "NOTE: Installing an application from third party remote repositories isn't "
 "secured as installing an application from official repositories of your "
 "distribution."
 msgstr ""
 
-#: pardusflatpakgui/installfromfileinputwindow.py:66
-#: pardusflatpakgui/installinputwindow.py:76 pardusflatpakgui/mainwindow.py:90
+#: pardusflatpakgui/installfromentrywindow.py:76
+#: pardusflatpakgui/installfromfilewindow.py:66
+#: pardusflatpakgui/mainwindow.py:90
 msgid "I_nstall"
 msgstr ""
 
-#: pardusflatpakgui/installfromfileinputwindow.py:71
-msgid "Choose a file"
+#: pardusflatpakgui/installfromentrywindow.py:80
+msgid "Enter an application name"
 msgstr ""
 
-#: pardusflatpakgui/installfromfilewindow.py:79
-#: pardusflatpakgui/installfromfilewindow.py:93
-msgid "Installing from file..."
+#: pardusflatpakgui/installfromentrywindow.py:90
+msgid "<big><b>Input Error</b></big>"
 msgstr ""
 
-#: pardusflatpakgui/installinputwindow.py:67
-msgid ""
-"Please enter an application name (Ex: org.libreoffice.LibreOffice) what you "
-"want to install from Flathub."
+#: pardusflatpakgui/installfromentrywindow.py:92
+msgid "Input entered is invalid."
 msgstr ""
 
-#: pardusflatpakgui/installinputwindow.py:80
-msgid "Enter an application name"
+#: pardusflatpakgui/installfromfilewindow_2.py:79
+#: pardusflatpakgui/installfromfilewindow_2.py:93
+msgid "Installing from file..."
 msgstr ""
 
-#: pardusflatpakgui/installinputwindow.py:90
-msgid "<big><b>Input Error</b></big>"
+#: pardusflatpakgui/installfromfilewindow.py:55
+msgid "Please choose a Flatpak reference file."
 msgstr ""
 
-#: pardusflatpakgui/installinputwindow.py:92
-msgid "Input entered is invalid."
+#: pardusflatpakgui/installfromfilewindow.py:71
+msgid "Choose a file"
 msgstr ""
 
 #: pardusflatpakgui/mainwindow.py:61

pardusflatpakgui/flatpakguiapp.py

@@ -93,7 +93,7 @@ class FlatpakGUIApp(Gtk.Application):
                     return None
 
                 InstallWindow(self, self.AppToInstall,
-                              self.FlatpakInstallation, None)
+                                        self.FlatpakInstallation, None)
         else:
             self.MessageDialogError.set_markup(
                 _("<big><b>Argument Error</b></big>"))

pardusflatpakgui/installinputwindow.py → pardusflatpakgui/installfromentrywindow.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from pardusflatpakgui.installwindow import InstallWindow
+from pardusflatpakgui.installfromentrywindow_2 import InstallFromEntryWindow2
 
 import gettext
 import locale
@@ -34,7 +34,7 @@ _ = gettext.gettext
 gettext.install("pardus-flatpak-gui", "po/")
 
 
-class InstallInputWindow(object):
+class InstallFromEntryWindow(object):
     def __init__(self, application, flatpakinstallation, liststore):
         self.Application = application
         self.FlatpakInstallation = flatpakinstallation
@@ -113,8 +113,8 @@ class InstallInputWindow(object):
                 self.AppToInstall = listitem
 
         self.InstallInputEntry.set_text("")
-        InstallWindow(self.Application, self.AppToInstall,
-                      self.FlatpakInstallation, self.ListStoreMain)
+        InstallFromEntryWindow2(self.Application, self.AppToInstall,
+                                self.FlatpakInstallation, self.ListStoreMain)
         self.onDestroy()
 
     def onDestroy(self, *args):

pardusflatpakgui/installdirectwindow.py → pardusflatpakgui/installfromentrywindow_2.py

 #!/usr/bin/env python3
 #
-# Pardus Flatpak GUI direct install window module
+# Pardus Flatpak GUI install window module
 # Copyright (C) 2020 Erdem Ersoy
 #
 # This program is free software: you can redistribute it and/or modify
@@ -29,26 +29,21 @@ gi.require_version('Gio', '2.0')
 from gi.repository import Gtk, Flatpak, GLib, Gio
 
 locale.setlocale(locale.LC_ALL, "")
-gettext.bindtextdomain("flatpak-gui", "po/")
-gettext.textdomain("flatpak-gui")
+gettext.bindtextdomain("pardus-flatpak-gui", "po/")
+gettext.textdomain("pardus-flatpak-gui")
 _ = gettext.gettext
-gettext.install("flatpak-gui", "po/")
+gettext.install("pardus-flatpak-gui", "po/")
 
 
-class InstallDirectWindow(object):
-    def __init__(self, application, apptoinstrealname, apptoinstarch,
-                 apptoinstbranch, apptoinstremote, flatpakinstallation,
+class InstallFromEntryWindow2(object):
+    def __init__(self, application, apptoinst, flatpakinstallation,
                  liststore):
         self.Application = application
 
-        self.AppToInstallRealName = apptoinstrealname
-        self.AppToInstallArch = apptoinstarch
-        self.AppToInstallBranch = apptoinstbranch
-        self.AppToInstallRemote = apptoinstremote
-        self.AppToInstall = Flatpak.Ref.parse("app/" +
-                                self.AppToInstallRealName + "/" +
-                                self.AppToInstallArch + "/" +
-                                self.AppToInstallBranch)
+        self.AppToInstall = apptoinst
+        self.AppToInstallRealName = self.AppToInstall.get_name()
+        self.AppToInstallArch = self.AppToInstall.get_arch()
+        self.AppToInstallBranch = self.AppToInstall.get_branch()
 
         self.FlatpakInstallation = flatpakinstallation
         self.FlatpakTransaction = \
@@ -63,7 +58,7 @@ class InstallDirectWindow(object):
         self.FlatpakTransaction.set_no_deploy(False)
         self.FlatpakTransaction.set_no_pull(False)
         self.FlatpakTransaction.add_install(
-            self.AppToInstallRemote,
+            self.AppToInstall.get_remote_name(),
             self.AppToInstall.format_ref(),
             None)
 
@@ -79,7 +74,7 @@ class InstallDirectWindow(object):
 
         self.InstallWindow = InstallBuilder.get_object("ActionWindow")
         self.InstallWindow.set_application(application)
-        self.InstallWindow.set_title(_("Installing: ") + self.AppToInstallRealName)
+        self.InstallWindow.set_title(_("Installing..."))
         self.InstallWindow.show()
 
         self.InstallProgressBar = InstallBuilder.get_object(
@@ -92,7 +87,7 @@ class InstallDirectWindow(object):
                                        "ActionTextBuffer")
 
         self.InstallTextBuffer.set_text("\0", -1)
-        self.StatusText = _("Installing: ") + self.AppToInstallRealName
+        self.StatusText = _("Installing...")
         self.InstallLabel.set_text(self.StatusText)
         self.InstallTextBuffer.set_text(self.StatusText)
 
@@ -185,15 +180,15 @@ class InstallDirectWindow(object):
     def InstallProgressCallback(self, *args):
         self.RefToInstall = Flatpak.Ref.parse(args[1].get_ref())
         self.RefToInstallRealName = self.RefToInstall.get_name()
-        if self.RefToInstallRealName != self.AppToInstallRealName:
-            statustext = _("Installing: ") + self.RefToInstallRealName
-            self.StatusText = self.StatusText + "\n" + statustext
-            GLib.idle_add(self.InstallLabel.set_text,
-                          statustext,
-                          priority=GLib.PRIORITY_DEFAULT)
-            GLib.idle_add(self.InstallTextBuffer.set_text,
-                          self.StatusText,
-                          priority=GLib.PRIORITY_DEFAULT)
+
+        statustext = _("Installing: ") + self.RefToInstallRealName
+        self.StatusText = self.StatusText + "\n" + statustext
+        GLib.idle_add(self.InstallLabel.set_text,
+                      statustext,
+                      priority=GLib.PRIORITY_DEFAULT)
+        GLib.idle_add(self.InstallTextBuffer.set_text,
+                      self.StatusText,
+                      priority=GLib.PRIORITY_DEFAULT)
 
         self.TransactionProgress = args[2]
         self.TransactionProgress.set_update_frequency(200)
@@ -207,15 +202,17 @@ class InstallDirectWindow(object):
     def InstallProgressCallbackError(self, *args):
         self.RefToInstall = Flatpak.Ref.parse(args[1].get_ref())
         self.RefToInstallRealName = self.RefToInstall.get_name()
+
+        statustext = _("Not installed: ") + self.RefToInstallRealName
+        self.StatusText = self.StatusText + "\n" + statustext
+        GLib.idle_add(self.InstallLabel.set_text,
+                      statustext,
+                      priority=GLib.PRIORITY_DEFAULT)
+        GLib.idle_add(self.InstallTextBuffer.set_text,
+                      self.StatusText,
+                      priority=GLib.PRIORITY_DEFAULT)
+
         if self.RefToInstallRealName != self.AppToInstallRealName:
-            statustext = _("Not installed: ") + self.RefToInstallRealName
-            self.StatusText = self.StatusText + "\n" + statustext
-            GLib.idle_add(self.InstallLabel.set_text,
-                          statustext,
-                          priority=GLib.PRIORITY_DEFAULT)
-            GLib.idle_add(self.InstallTextBuffer.set_text,
-                          self.StatusText,
-                          priority=GLib.PRIORITY_DEFAULT)
             return True
         else:
             return False

pardusflatpakgui/installfromfileinputwindow.py

-#!/usr/bin/env python3
-#
-# Pardus Flatpak GUI install from file input window module
-# Copyright (C) 2020 Erdem Ersoy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from pardusflatpakgui.installfromfilewindow import InstallFromFileWindow
-
-import gettext
-import locale
-import gi
-gi.require_version('Gtk', '3.0')
-gi.require_version('Flatpak', '1.0')
-gi.require_version('GLib', '2.0')
-from gi.repository import Gtk, Flatpak, GLib
-
-locale.setlocale(locale.LC_ALL, "")
-gettext.bindtextdomain("pardus-flatpak-gui", "po/")
-gettext.textdomain("pardus-flatpak-gui")
-_ = gettext.gettext
-gettext.install("pardus-flatpak-gui", "po/")
-
-
-class InstallFromFileInputWindow(object):
-    def __init__(self, application, flatpakinstallation, liststore):
-        self.Application = application
-        self.FlatpakInstallation = flatpakinstallation
-        self.ListStoreMain = liststore
-
-        try:
-            InstallFromFileInputGUIFile = "ui/installfromfileinputwindow.glade"
-            self.InstallFromFileInputBuilder = \
-                Gtk.Builder.new_from_file(InstallFromFileInputGUIFile)
-            self.InstallFromFileInputBuilder.connect_signals(self)
-        except GLib.GError:
-            print(_("Error reading GUI file: ") + InstallFromFileInputGUIFile)
-            raise
-
-        self.InstallFromFileInputLabel = \
-            self.InstallFromFileInputBuilder.get_object(
-                "InstallFromFileInputLabel")
-        self.InstallFromFileInputLabel.set_text(
-            _("Please choose a Flatpak reference file."))
-
-        self.InstallFromFileInputLabel2 = \
-            self.InstallFromFileInputBuilder.get_object(
-                "InstallFromFileInputLabel2")
-        self.InstallFromFileInputLabel2.set_text(
-            _("NOTE: Installing an application from third party remote repositories isn't secured as installing an application from official repositories of your distribution."))
-
-        self.InstallFromFileInputButton = \
-            self.InstallFromFileInputBuilder.get_object(
-                "InstallFromFileInputButton")
-        self.InstallFromFileInputButton.set_label(_("I_nstall"))
-
-        self.InstallFromFileInputWindow = \
-            self.InstallFromFileInputBuilder.get_object(
-                "InstallFromFileInputWindow")
-        self.InstallFromFileInputWindow.set_title(_("Choose a file"))
-        self.InstallFromFileInputWindow.set_application(application)
-        self.InstallFromFileInputWindow.show()
-
-    def onInstallAtInstallFromFile(self, button):
-        self.InstallFromFileInputFileChooser = \
-            self.InstallFromFileInputBuilder.get_object(
-                "InstallFromFileInputFileChooser")
-        self.FileFlatpakRefName = \
-            self.InstallFromFileInputFileChooser.get_filename()
-
-        InstallFromFileWindow(self.Application, self.FlatpakInstallation,
-                              self.FileFlatpakRefName,
-                              self.ListStoreMain)
-        self.InstallFromFileInputFileChooser.unselect_filename(
-            self.FileFlatpakRefName)
-        self.onDestroy()
-
-    def onDestroy(self, *args):
-        self.InstallFromFileInputWindow.destroy()

pardusflatpakgui/installwindow.py

 #!/usr/bin/env python3
 #
-# Pardus Flatpak GUI install window module
+# Pardus Flatpak GUI direct install window module
 # Copyright (C) 2020 Erdem Ersoy
 #
 # This program is free software: you can redistribute it and/or modify
@@ -29,21 +29,26 @@ gi.require_version('Gio', '2.0')
 from gi.repository import Gtk, Flatpak, GLib, Gio
 
 locale.setlocale(locale.LC_ALL, "")
-gettext.bindtextdomain("pardus-flatpak-gui", "po/")
-gettext.textdomain("pardus-flatpak-gui")
+gettext.bindtextdomain("flatpak-gui", "po/")
+gettext.textdomain("flatpak-gui")
 _ = gettext.gettext
-gettext.install("pardus-flatpak-gui", "po/")
+gettext.install("flatpak-gui", "po/")
 
 
 class InstallWindow(object):
-    def __init__(self, application, apptoinst, flatpakinstallation,
+    def __init__(self, application, apptoinstrealname, apptoinstarch,
+                 apptoinstbranch, apptoinstremote, flatpakinstallation,
                  liststore):
         self.Application = application
 
-        self.AppToInstall = apptoinst
-        self.AppToInstallRealName = self.AppToInstall.get_name()
-        self.AppToInstallArch = self.AppToInstall.get_arch()
-        self.AppToInstallBranch = self.AppToInstall.get_branch()
+        self.AppToInstallRealName = apptoinstrealname
+        self.AppToInstallArch = apptoinstarch
+        self.AppToInstallBranch = apptoinstbranch
+        self.AppToInstallRemote = apptoinstremote
+        self.AppToInstall = Flatpak.Ref.parse("app/" +
+                                self.AppToInstallRealName + "/" +
+                                self.AppToInstallArch + "/" +
+                                self.AppToInstallBranch)
 
         self.FlatpakInstallation = flatpakinstallation
         self.FlatpakTransaction = \
@@ -58,7 +63,7 @@ class InstallWindow(object):
         self.FlatpakTransaction.set_no_deploy(False)
         self.FlatpakTransaction.set_no_pull(False)
         self.FlatpakTransaction.add_install(
-            self.AppToInstall.get_remote_name(),
+            self.AppToInstallRemote,
             self.AppToInstall.format_ref(),
             None)
 
@@ -74,7 +79,7 @@ class InstallWindow(object):
 
         self.InstallWindow = InstallBuilder.get_object("ActionWindow")
         self.InstallWindow.set_application(application)
-        self.InstallWindow.set_title(_("Installing: ") + self.AppToInstallRealName)
+        self.InstallWindow.set_title(_("Installing..."))
         self.InstallWindow.show()
 
         self.InstallProgressBar = InstallBuilder.get_object(
@@ -87,7 +92,7 @@ class InstallWindow(object):
                                        "ActionTextBuffer")
 
         self.InstallTextBuffer.set_text("\0", -1)
-        self.StatusText = _("Installing: ") + self.AppToInstallRealName
+        self.StatusText = _("Installing...")
         self.InstallLabel.set_text(self.StatusText)
         self.InstallTextBuffer.set_text(self.StatusText)
 
@@ -180,15 +185,15 @@ class InstallWindow(object):
     def InstallProgressCallback(self, *args):
         self.RefToInstall = Flatpak.Ref.parse(args[1].get_ref())
         self.RefToInstallRealName = self.RefToInstall.get_name()
-        if self.RefToInstallRealName != self.AppToInstallRealName:
-            statustext = _("Installing: ") + self.RefToInstallRealName
-            self.StatusText = self.StatusText + "\n" + statustext
-            GLib.idle_add(self.InstallLabel.set_text,
-                          statustext,
-                          priority=GLib.PRIORITY_DEFAULT)
-            GLib.idle_add(self.InstallTextBuffer.set_text,
-                          self.StatusText,
-                          priority=GLib.PRIORITY_DEFAULT)
+
+        statustext = _("Installing: ") + self.RefToInstallRealName
+        self.StatusText = self.StatusText + "\n" + statustext
+        GLib.idle_add(self.InstallLabel.set_text,
+                      statustext,
+                      priority=GLib.PRIORITY_DEFAULT)
+        GLib.idle_add(self.InstallTextBuffer.set_text,
+                      self.StatusText,
+                      priority=GLib.PRIORITY_DEFAULT)
 
         self.TransactionProgress = args[2]
         self.TransactionProgress.set_update_frequency(200)
@@ -202,15 +207,17 @@ class InstallWindow(object):
     def InstallProgressCallbackError(self, *args):
         self.RefToInstall = Flatpak.Ref.parse(args[1].get_ref())
         self.RefToInstallRealName = self.RefToInstall.get_name()
+
+        statustext = _("Not installed: ") + self.RefToInstallRealName
+        self.StatusText = self.StatusText + "\n" + statustext
+        GLib.idle_add(self.InstallLabel.set_text,
+                      statustext,
+                      priority=GLib.PRIORITY_DEFAULT)
+        GLib.idle_add(self.InstallTextBuffer.set_text,
+                      self.StatusText,
+                      priority=GLib.PRIORITY_DEFAULT)
+
         if self.RefToInstallRealName != self.AppToInstallRealName:
-            statustext = _("Not installed: ") + self.RefToInstallRealName
-            self.StatusText = self.StatusText + "\n" + statustext
-            GLib.idle_add(self.InstallLabel.set_text,
-                          statustext,
-                          priority=GLib.PRIORITY_DEFAULT)
-            GLib.idle_add(self.InstallTextBuffer.set_text,
-                          self.StatusText,
-                          priority=GLib.PRIORITY_DEFAULT)
             return True
         else:
             return False

pardusflatpakgui/mainwindow.py

@@ -17,9 +17,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from pardusflatpakgui.infowindow import InfoWindow
-from pardusflatpakgui.installdirectwindow import InstallDirectWindow
-from pardusflatpakgui.installinputwindow import InstallInputWindow
-from pardusflatpakgui.installfromfileinputwindow import InstallFromFileInputWindow
+from pardusflatpakgui.installwindow import InstallWindow
+from pardusflatpakgui.installfromentrywindow import InstallFromEntryWindow
+from pardusflatpakgui.installfromfilewindow import InstallFromFileWindow
 from pardusflatpakgui.uninstallwindow import UninstallWindow
 from pardusflatpakgui.updateallwindow import UpdateAllWindow
 
@@ -466,18 +466,18 @@ class MainWindow(object):
                 App = item
                 break
 
-        InstallDirectWindow(self.Application, AppToInstallRealName,
-                            AppToInstallArch, AppToInstallBranch,
-                            AppToInstallRemote, self.FlatpakInstallation,
-                            self.ListStoreMain)
+        InstallWindow(self.Application, AppToInstallRealName,
+                      AppToInstallArch, AppToInstallBranch,
+                      AppToInstallRemote, self.FlatpakInstallation,
+                      self.ListStoreMain)
 
     def onInstallFromEntry(self, menuitem):
-        InstallInputWindow(self.Application, self.FlatpakInstallation,
-                           self.ListStoreMain)
+        InstallFromEntryWindow(self.Application, self.FlatpakInstallation,
+                               self.ListStoreMain)
 
     def onInstallFromFile(self, menuitem):
-        InstallFromFileInputWindow(self.Application, self.FlatpakInstallation,
-                                   self.ListStoreMain)
+        InstallFromFileWindow(self.Application, self.FlatpakInstallation,
+                               self.ListStoreMain)
 
     def onUpdateAll(self, menuitem):
         UpdateAllWindow(self.Application, self.FlatpakInstallation,

po/en/LC_MESSAGES/pardus-flatpak-gui.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Flatpak GUI 1.0-rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:06+0300\n"
+"POT-Creation-Date: 2020-04-13 16:16+0300\n"
 "PO-Revision-Date: 2020-04-13 14:08+0300\n"
 "Last-Translator: Erdem Ersoy <<erdem.ersoy@pardus.org.tr>>\n"
 "Language-Team: Erdem Ersoy <erdem.ersoy@pardus.org.tr>\n"
@@ -20,7 +20,8 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 
 #: pardusflatpakgui/flatpakguiapp.py:49
-#: pardusflatpakgui/installinputwindow.py:57 pardusflatpakgui/mainwindow.py:69
+#: pardusflatpakgui/installfromentrywindow.py:57
+#: pardusflatpakgui/mainwindow.py:69
 msgid "Error reading message dialogs GUI file: "
 msgstr "Error reading message dialogs GUI file: "
 
@@ -48,11 +49,12 @@ msgstr "<big><b>Argument Error</b></big>"
 msgid "There are too many arguments. Argument count: "
 msgstr "There are too many arguments. Argument count: "
 
-#: pardusflatpakgui/infowindow.py:45 pardusflatpakgui/installdirectwindow.py:77
-#: pardusflatpakgui/installfromfileinputwindow.py:48
-#: pardusflatpakgui/installfromfilewindow.py:73
-#: pardusflatpakgui/installinputwindow.py:49
-#: pardusflatpakgui/installwindow.py:72 pardusflatpakgui/mainwindow.py:53
+#: pardusflatpakgui/infowindow.py:45
+#: pardusflatpakgui/installfromentrywindow_2.py:72
+#: pardusflatpakgui/installfromentrywindow.py:49
+#: pardusflatpakgui/installfromfilewindow_2.py:73
+#: pardusflatpakgui/installfromfilewindow.py:48
+#: pardusflatpakgui/installwindow.py:77 pardusflatpakgui/mainwindow.py:53
 #: pardusflatpakgui/uninstallwindow.py:69
 #: pardusflatpakgui/updateallwindow.py:57
 msgid "Error reading GUI file: "
@@ -66,39 +68,46 @@ msgstr "_Copy to Clipboard"
 msgid "Info About "
 msgstr "Info About "
 
-#: pardusflatpakgui/installdirectwindow.py:82
-#: pardusflatpakgui/installdirectwindow.py:95
-#: pardusflatpakgui/installdirectwindow.py:189
-#: pardusflatpakgui/installfromfilewindow.py:191
-#: pardusflatpakgui/installwindow.py:77 pardusflatpakgui/installwindow.py:90
-#: pardusflatpakgui/installwindow.py:184
-msgid "Installing: "
-msgstr "Installing: "
+#: pardusflatpakgui/installfromentrywindow_2.py:77
+#: pardusflatpakgui/installfromentrywindow_2.py:90
+#: pardusflatpakgui/installwindow.py:82 pardusflatpakgui/installwindow.py:95
+msgid "Installing..."
+msgstr "Installing..."
 
-#: pardusflatpakgui/installdirectwindow.py:118
-#: pardusflatpakgui/installfromfilewindow.py:116
-#: pardusflatpakgui/installwindow.py:113
+#: pardusflatpakgui/installfromentrywindow_2.py:113
+#: pardusflatpakgui/installfromfilewindow_2.py:116
+#: pardusflatpakgui/installwindow.py:118
 msgid "Error at installation!"
 msgstr "Error at installation!"
 
-#: pardusflatpakgui/installdirectwindow.py:127
-#: pardusflatpakgui/installfromfilewindow.py:125
-#: pardusflatpakgui/installwindow.py:122
+#: pardusflatpakgui/installfromentrywindow_2.py:122
+#: pardusflatpakgui/installfromfilewindow_2.py:125
+#: pardusflatpakgui/installwindow.py:127
 msgid "Installing completed!"
 msgstr "Installing completed!"
 
-#: pardusflatpakgui/installdirectwindow.py:211
-#: pardusflatpakgui/installfromfilewindow.py:213
-#: pardusflatpakgui/installwindow.py:206
+#: pardusflatpakgui/installfromentrywindow_2.py:184
+#: pardusflatpakgui/installfromfilewindow_2.py:191
+#: pardusflatpakgui/installwindow.py:189
+msgid "Installing: "
+msgstr "Installing: "
+
+#: pardusflatpakgui/installfromentrywindow_2.py:206
+#: pardusflatpakgui/installfromfilewindow_2.py:213
+#: pardusflatpakgui/installwindow.py:211
 msgid "Not installed: "
 msgstr "Not installed: "
 
-#: pardusflatpakgui/installfromfileinputwindow.py:55
-msgid "Please choose a Flatpak reference file."
-msgstr "Please choose a Flatpak reference file."
+#: pardusflatpakgui/installfromentrywindow.py:67
+msgid ""
+"Please enter an application name (Ex: org.libreoffice.LibreOffice) what you "
+"want to install from Flathub."
+msgstr ""
+"Please enter an application name (Ex: org.libreoffice.LibreOffice) what you "
+"want to install from Flathub."
 
-#: pardusflatpakgui/installfromfileinputwindow.py:61
-#: pardusflatpakgui/installinputwindow.py:72
+#: pardusflatpakgui/installfromentrywindow.py:72
+#: pardusflatpakgui/installfromfilewindow.py:61
 msgid ""
 "NOTE: Installing an application from third party remote repositories isn't "
 "secured as installing an application from official repositories of your "
@@ -108,40 +117,37 @@ msgstr ""
 "secured as installing an application from official repositories of your "
 "distribution."
 
-#: pardusflatpakgui/installfromfileinputwindow.py:66
-#: pardusflatpakgui/installinputwindow.py:76 pardusflatpakgui/mainwindow.py:90
+#: pardusflatpakgui/installfromentrywindow.py:76
+#: pardusflatpakgui/installfromfilewindow.py:66
+#: pardusflatpakgui/mainwindow.py:90
 msgid "I_nstall"
 msgstr "I_nstall"
 
-#: pardusflatpakgui/installfromfileinputwindow.py:71
-msgid "Choose a file"
-msgstr "Choose a file"
-
-#: pardusflatpakgui/installfromfilewindow.py:79
-#: pardusflatpakgui/installfromfilewindow.py:93
-msgid "Installing from file..."
-msgstr "Installing from file..."
-
-#: pardusflatpakgui/installinputwindow.py:67
-msgid ""
-"Please enter an application name (Ex: org.libreoffice.LibreOffice) what you "
-"want to install from Flathub."
-msgstr ""
-"Please enter an application name (Ex: org.libreoffice.LibreOffice) what you "
-"want to install from Flathub."
-
-#: pardusflatpakgui/installinputwindow.py:80
+#: pardusflatpakgui/installfromentrywindow.py:80
 msgid "Enter an application name"
 msgstr "Enter an application name"
 
-#: pardusflatpakgui/installinputwindow.py:90
+#: pardusflatpakgui/installfromentrywindow.py:90
 msgid "<big><b>Input Error</b></big>"
 msgstr "<big><b>Input Error</b></big>"
 
-#: pardusflatpakgui/installinputwindow.py:92
+#: pardusflatpakgui/installfromentrywindow.py:92
 msgid "Input entered is invalid."
 msgstr "Input entered is invalid."
 
+#: pardusflatpakgui/installfromfilewindow_2.py:79
+#: pardusflatpakgui/installfromfilewindow_2.py:93
+msgid "Installing from file..."
+msgstr "Installing from file..."
+
+#: pardusflatpakgui/installfromfilewindow.py:55
+msgid "Please choose a Flatpak reference file."
+msgstr "Please choose a Flatpak reference file."
+
+#: pardusflatpakgui/installfromfilewindow.py:71
+msgid "Choose a file"
+msgstr "Choose a file"
+
 #: pardusflatpakgui/mainwindow.py:61
 msgid "Error reading About dialog GUI file: "
 msgstr "Error reading About dialog GUI file: "
@@ -407,9 +413,6 @@ msgstr "Updating completed!"
 #~ msgid "Installed from entry!"
 #~ msgstr "Installed from entry!"
 
-#~ msgid "Installing..."
-#~ msgstr "Installing..."
-
 #~ msgid "Version"
 #~ msgstr "Version"
 

po/tr/LC_MESSAGES/pardus-flatpak-gui.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:06+0300\n"
+"POT-Creation-Date: 2020-04-13 16:16+0300\n"
 "PO-Revision-Date: 2020-04-13 14:09+0300\n"
 "Last-Translator: Erdem Ersoy <<erdem.ersoy@pardus.org.tr>>\n"
 "Language-Team: \n"
@@ -19,7 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: pardusflatpakgui/flatpakguiapp.py:49
-#: pardusflatpakgui/installinputwindow.py:57 pardusflatpakgui/mainwindow.py:69
+#: pardusflatpakgui/installfromentrywindow.py:57
+#: pardusflatpakgui/mainwindow.py:69
 msgid "Error reading message dialogs GUI file: "
 msgstr "İleti pencereleri GUI dosyasını okumada hata: "
 
@@ -47,11 +48,12 @@ msgstr "<big><b>Argüman Hatası</b></big>"
 msgid "There are too many arguments. Argument count: "
 msgstr "Çok fazla argüman var. Argüman sayısı: "
 
-#: pardusflatpakgui/infowindow.py:45 pardusflatpakgui/installdirectwindow.py:77
-#: pardusflatpakgui/installfromfileinputwindow.py:48
-#: pardusflatpakgui/installfromfilewindow.py:73
-#: pardusflatpakgui/installinputwindow.py:49
-#: pardusflatpakgui/installwindow.py:72 pardusflatpakgui/mainwindow.py:53
+#: pardusflatpakgui/infowindow.py:45
+#: pardusflatpakgui/installfromentrywindow_2.py:72
+#: pardusflatpakgui/installfromentrywindow.py:49
+#: pardusflatpakgui/installfromfilewindow_2.py:73
+#: pardusflatpakgui/installfromfilewindow.py:48
+#: pardusflatpakgui/installwindow.py:77 pardusflatpakgui/mainwindow.py:53
 #: pardusflatpakgui/uninstallwindow.py:69
 #: pardusflatpakgui/updateallwindow.py:57
 msgid "Error reading GUI file: "
@@ -65,39 +67,46 @@ msgstr "_Panoya Kopyala"
 msgid "Info About "
 msgstr "Hakkında Bilgi: "
 
-#: pardusflatpakgui/installdirectwindow.py:82
-#: pardusflatpakgui/installdirectwindow.py:95
-#: pardusflatpakgui/installdirectwindow.py:189
-#: pardusflatpakgui/installfromfilewindow.py:191
-#: pardusflatpakgui/installwindow.py:77 pardusflatpakgui/installwindow.py:90
-#: pardusflatpakgui/installwindow.py:184
-msgid "Installing: "
-msgstr "Kuruluyor: "
+#: pardusflatpakgui/installfromentrywindow_2.py:77
+#: pardusflatpakgui/installfromentrywindow_2.py:90
+#: pardusflatpakgui/installwindow.py:82 pardusflatpakgui/installwindow.py:95
+msgid "Installing..."
+msgstr "Kuruluyor..."
 
-#: pardusflatpakgui/installdirectwindow.py:118
-#: pardusflatpakgui/installfromfilewindow.py:116
-#: pardusflatpakgui/installwindow.py:113
+#: pardusflatpakgui/installfromentrywindow_2.py:113
+#: pardusflatpakgui/installfromfilewindow_2.py:116
+#: pardusflatpakgui/installwindow.py:118
 msgid "Error at installation!"
 msgstr "Kurulumda hata!"
 
-#: pardusflatpakgui/installdirectwindow.py:127
-#: pardusflatpakgui/installfromfilewindow.py:125
-#: pardusflatpakgui/installwindow.py:122
+#: pardusflatpakgui/installfromentrywindow_2.py:122
+#: pardusflatpakgui/installfromfilewindow_2.py:125
+#: pardusflatpakgui/installwindow.py:127
 msgid "Installing completed!"
 msgstr "Kurulum tamamlandı!"
 
-#: pardusflatpakgui/installdirectwindow.py:211
-#: pardusflatpakgui/installfromfilewindow.py:213
-#: pardusflatpakgui/installwindow.py:206
+#: pardusflatpakgui/installfromentrywindow_2.py:184
+#: pardusflatpakgui/installfromfilewindow_2.py:191
+#: pardusflatpakgui/installwindow.py:189
+msgid "Installing: "
+msgstr "Kuruluyor: "
+
+#: pardusflatpakgui/installfromentrywindow_2.py:206
+#: pardusflatpakgui/installfromfilewindow_2.py:213
+#: pardusflatpakgui/installwindow.py:211
 msgid "Not installed: "
 msgstr "Kurulmadı: "
 
-#: pardusflatpakgui/installfromfileinputwindow.py:55
-msgid "Please choose a Flatpak reference file."
-msgstr "Lütfen bir Flatpak başvuru dosyası seçiniz."
+#: pardusflatpakgui/installfromentrywindow.py:67
+msgid ""
+"Please enter an application name (Ex: org.libreoffice.LibreOffice) what you "
+"want to install from Flathub."
+msgstr ""
+"Lütfen Flathub'tan yüklemek istediğiniz bir uygulama adı (Ör: org."
+"libreoffice.LibreOffice) giriniz."
 
-#: pardusflatpakgui/installfromfileinputwindow.py:61
-#: pardusflatpakgui/installinputwindow.py:72
+#: pardusflatpakgui/installfromentrywindow.py:72
+#: pardusflatpakgui/installfromfilewindow.py:61
 msgid ""
 "NOTE: Installing an application from third party remote repositories isn't "
 "secured as installing an application from official repositories of your "
@@ -106,40 +115,37 @@ msgstr ""
 "NOT: Üçüncü parti uzak depolardan bir uygulama yüklemek dağıtımınızın resmî "
 "depolarından bir uygulama yükleme kadar güvenli değildir."
 
-#: pardusflatpakgui/installfromfileinputwindow.py:66
-#: pardusflatpakgui/installinputwindow.py:76 pardusflatpakgui/mainwindow.py:90
+#: pardusflatpakgui/installfromentrywindow.py:76
+#: pardusflatpakgui/installfromfilewindow.py:66
+#: pardusflatpakgui/mainwindow.py:90
 msgid "I_nstall"
 msgstr "_Kur"
 
-#: pardusflatpakgui/installfromfileinputwindow.py:71
-msgid "Choose a file"
-msgstr "Bir dosya seç"
-
-#: pardusflatpakgui/installfromfilewindow.py:79
-#: pardusflatpakgui/installfromfilewindow.py:93
-msgid "Installing from file..."
-msgstr "Dosyadan kuruluyor..."
-
-#: pardusflatpakgui/installinputwindow.py:67
-msgid ""
-"Please enter an application name (Ex: org.libreoffice.LibreOffice) what you "
-"want to install from Flathub."
-msgstr ""
-"Lütfen Flathub'tan yüklemek istediğiniz bir uygulama adı (Ör: org."
-"libreoffice.LibreOffice) giriniz."
-
-#: pardusflatpakgui/installinputwindow.py:80
+#: pardusflatpakgui/installfromentrywindow.py:80
 msgid "Enter an application name"
 msgstr "Bir uygulama adı giriniz"
 
-#: pardusflatpakgui/installinputwindow.py:90
+#: pardusflatpakgui/installfromentrywindow.py:90
 msgid "<big><b>Input Error</b></big>"
 msgstr "<big><b>Girdi Hatası</b></big>"
 
-#: pardusflatpakgui/installinputwindow.py:92
+#: pardusflatpakgui/installfromentrywindow.py:92
 msgid "Input entered is invalid."
 msgstr "Girilen girdi geçersiz."
 
+#: pardusflatpakgui/installfromfilewindow_2.py:79
+#: pardusflatpakgui/installfromfilewindow_2.py:93
+msgid "Installing from file..."
+msgstr "Dosyadan kuruluyor..."
+
+#: pardusflatpakgui/installfromfilewindow.py:55
+msgid "Please choose a Flatpak reference file."
+msgstr "Lütfen bir Flatpak başvuru dosyası seçiniz."
+
+#: pardusflatpakgui/installfromfilewindow.py:71
+msgid "Choose a file"
+msgstr "Bir dosya seç"
+
 #: pardusflatpakgui/mainwindow.py:61
 msgid "Error reading About dialog GUI file: "
 msgstr "Hakkında iletişim kutusu GUI dosyasını okumada hata: "
@@ -405,9 +411,6 @@ msgstr "Güncellenme tamamlandı!"
 #~ msgid "Installed from entry!"
 #~ msgstr "Girdiden kuruldu!"
 
-#~ msgid "Installing..."
-#~ msgstr "Kuruluyor..."
-
 #~ msgid "Version"
 #~ msgstr "Sürümü"