Merge lp:lubuntu-software-center/stable into lp:lubuntu-software-center

[MiKRo.MiCsoftware.Com]

[ԜаӀtеr Ⅼарсһуnѕkі (wxl)]

As the project has been abandoned by its developers and dropped by Lubuntu, I see no value to this at all. Furthermore, the only version in the Ubuntu archives is in Xenial which is unsupported by Lubuntu as well as every other flavor.

review: Disapprove

Unmerged revisions

124. By Stephen Smally on 2012-03-04

refixed build

123. By Stephen Smally on 2012-03-04

fixed build

=== modified file 'Makefile.am'
--- Makefile.am	2015-02-22 02:43:13 +0000
+++ Makefile.am	2019-10-06 04:37:36 +0000
@@ -39,9 +39,7 @@
 
 lscdatadir = $(datadir)/LSC
 lscdata_DATA = \
-	data/categories.ini \
-	data/lsc.ui \
-	data/preferences.ui
+	data/categories.ini
 
 icon16dir = $(datadir)/icons/hicolor/16x16/apps
 icon16_DATA = data/icons/16x16/light-software-center.png
 
=== modified file 'src/main.py'
--- src/main.py	2015-12-28 22:26:36 +0000
+++ src/main.py	2019-10-06 04:37:36 +0000
@@ -581,6 +581,7 @@
         else:
             inst = False
         self.setup_infos(
+<<<<<<< TREE
             self.pkg_selected[0],
             self.ui.pages,
             self.pkg_selected[2],
@@ -593,6 +594,18 @@
             self.candidate.ver_str,
             self.ui.pages.get_current_page(),
             inst
+=======
+        self.pkg_selected[0],
+        self.ui.pages,
+        self.pkg_selected[2],
+        u"\n".join([self.pkg_selected[1].split("\n")[0], threadingops.getshortdesc(self.pkg_selected[0])]),
+        threadingops.getdesc(self.pkg_selected[0]).replace("\n ", "\n"),
+        (apt_pkg.size_to_str(self.candidate.size),
+        apt_pkg.size_to_str(self.candidate.installed_size)),
+        self.candidate.ver_str,
+        self.ui.pages.get_current_page(),
+        inst
+>>>>>>> MERGE-SOURCE
         )
 
     def app_item_activated(self, widget, path, column, inst_rem):
@@ -674,6 +687,7 @@
         description_formatted = description_formatted.replace(
             title.split("\n")[-1], "")
         self.ui.appsinfo.desctext.set_text(description_formatted.strip())
+<<<<<<< TREE
         self.ui.appsinfo.details.to_download.set_markup(
             "<b>" + _("Download Size:") + "</b>" + " %s" % size[0])
         self.ui.appsinfo.details.installed.set_markup(
@@ -684,6 +698,13 @@
             "stock_help", Gtk.IconSize.LARGE_TOOLBAR)
         self.ui.categorie_label.set_text(_(
             "Info on") + " %s" % title.split("\n")[0])
+=======
+        self.ui.appsinfo.details.to_download.set_markup("<b>"+_("Download Size:")+"</b>"+" %s" % size[0])
+        self.ui.appsinfo.details.installed.set_markup("<b>"+_("Installed Size:")+"</b>"+" %s" % size[1])
+        self.ui.appsinfo.details.version.set_markup("<b>"+_("Version:")+"</b>"+" %s (%s)" % (version, name))
+        self.ui.categorie_icon.set_from_icon_name("stock_help", Gtk.IconSize.LARGE_TOOLBAR)
+        self.ui.categorie_label.set_text(_("Infos about")+u" %s" % title.split("\n")[0])
+>>>>>>> MERGE-SOURCE
         self.ui.appsinfo.scrot_button.set_visible(False)
         if control.controller.show_scrot:
             threadingops.download_screenshot(
@@ -773,9 +794,16 @@
                     status_dict[self.pkg_in_cache.current_state],
                 ]
                 model.append(self.item)
+<<<<<<< TREE
                 self.ui.progressbar.set_fraction(float(cur) / float(tot))
         except KeyError:
                 pass
+=======
+                self.ui.progressbar.set_fraction(float(cur)/float(tot))
+                while Gtk.events_pending():
+                    Gtk.main_iteration()
+        except KeyError: pass
+>>>>>>> MERGE-SOURCE
 
 
 def lscmain():