From f9b5364f7e3c0443e06976edf3987b412e15bea9 Mon Sep 17 00:00:00 2001
From: Necoro <>
Date: Mon, 14 Jan 2008 22:46:23 +0000
Subject: r632@Devoty: necoro | 2008-01-14 23:44:52 +0100 small changes
---
portato/gui/gtk/windows.py | 14 +-
portato/gui/templates/portato.glade | 341 ++++++++++++++++++------------------
2 files changed, 180 insertions(+), 175 deletions(-)
(limited to 'portato')
diff --git a/portato/gui/gtk/windows.py b/portato/gui/gtk/windows.py
index b49e701..3f5255f 100644
--- a/portato/gui/gtk/windows.py
+++ b/portato/gui/gtk/windows.py
@@ -23,7 +23,7 @@ from gettext import lgettext as _
# our backend stuff
from ... import get_listener, plugin
-from ...helper import debug, warning, error, unique_array, N_
+from ...helper import debug, warning, error, info, unique_array, N_
from ...session import Session
from ...constants import CONFIG_LOCATION, VERSION, APP_ICON
from ...backend import flags, system
@@ -513,7 +513,7 @@ class PackageTable:
texts = text.split(" ")
ftexts = []
- for t in texts:
+ for count, t in enumerate(texts):
if not t.startswith(("http:", "ftp:")):
if count == 0:
error(_("The first homepage part does not start with 'http' or 'ftp'."))
@@ -521,7 +521,7 @@ class PackageTable:
continue
else:
info(_("Blank inside homepage."))
- ftexts[-1] += t
+ ftexts[-1] += " %s" % t
else:
ftexts.append(t)
@@ -731,7 +731,13 @@ class PackageTable:
else:
self.unmergeBtn.set_sensitive(True)
- self.vb.show_all()
+ # XXX: workaround: currently the useflags are selected as the first tab
+ # but on first start we want the general page
+ if not self.vb.get_property("visible"):
+ self.vb.show_all()
+ self.notebook.set_current_page(0)
+ else:
+ self.vb.show_all()
return True
diff --git a/portato/gui/templates/portato.glade b/portato/gui/templates/portato.glade
index 671032d..cb0fe6a 100644
--- a/portato/gui/templates/portato.glade
+++ b/portato/gui/templates/portato.glade
@@ -548,199 +548,198 @@
-
+
True
+ True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
True
- <b>Installed, but not in portage anymore</b>
- True
+ Testing
+ 0
+ 0
+ True
+
- 2
- 3
- 4
+ 5
+ 6
+ GTK_FILL
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- True
- <span foreground='red'><b>MISSING KEYWORD</b></span>
- True
+ 0
+ 1
2
- 3
- 4
+ 6
+ 7
-
+
True
+ True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 5
-
-
-
+ True
+ Masked
+ 0
+ 0
+ True
+
- 1
- 2
- 2
- 3
+ 6
+ 7
+ GTK_FILL
-
+
True
+ True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ True
+ Installed
0
- <b>Description:</b>
- True
- True
+ 0
+ True
+
+ 4
+ 5
GTK_FILL
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- True
0
- <b>Overlay:</b>
+ <b>Homepage:</b>
True
True
- 1
- 2
+ 2
+ 3
GTK_FILL
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ True
0
label
- True
+ True
1
2
+ 1
+ 2
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- True
0
label
- True
- True
+ True
1
2
- 1
- 2
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ True
0
- <b>Homepage:</b>
+ <b>Overlay:</b>
True
True
- 2
- 3
+ 1
+ 2
GTK_FILL
-
+
True
- True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- True
- Installed
0
- 0
- True
-
+ <b>Description:</b>
+ True
+ True
- 4
- 5
GTK_FILL
-
+
True
- True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- True
- Masked
- 0
- 0
- True
-
+ 5
+
+
+
- 6
- 7
- GTK_FILL
+ 1
+ 2
+ 2
+ 3
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
+ True
+ <span foreground='red'><b>MISSING KEYWORD</b></span>
+ True
- 1
2
- 6
- 7
+ 3
+ 4
-
+
True
- True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
True
- Testing
- 0
- 0
- True
-
+ <b>Installed, but not in portage anymore</b>
+ True
- 5
- 6
- GTK_FILL
+ 2
+ 3
+ 4
@@ -1441,189 +1440,189 @@
-
+
True
+ 0
+ 5
+ <u><i>Masking Keywords</i></u>
+ True
+ True
- 1
- 2
- 3
- 4
+ 7
+ 8
+ 5
-
+
True
0
- File name to use, if package.use is a directory:
+ 5
+ <u><i>Testing Keywords</i></u>
+ True
True
- 3
- 4
+ 4
+ 5
+ 5
-
+
True
- Add only exact version to package.use
- 0
- True
+ 0
+ 5
+ <u><i>Use-Flags</i></u>
+ True
+ True
+
+
+ 1
+ 2
+ 6
+
+
+
+
+ True
+
+
+ True
+ 0
+ GTK_SHADOW_OUT
+
+
+ True
+ 0
+ <u>You may use the following placeholders:</u>
+
+<i>$(cat)</i>: category
+<i>$(pkg)</i>: package name
+<i>$(cat-1)/$(cat-2)</i>: first/second part of the category
+ True
+
+
+
+
+
+ label_item
+
+
+
+
2
- 2
- 3
-
+
True
- Add only exact version to package.keywords
+ Add only exact version to package.mask/package.unmask
0
True
2
- 5
- 6
+ 8
+ 9
-
+
True
0
- File name to use, if package.keywords is a directory:
+ File name to use, if package.mask/package.unmask is a directory:
True
- 6
- 7
+ 9
+ 10
-
+
True
1
2
- 6
- 7
+ 9
+ 10
-
+
True
1
2
- 9
- 10
+ 6
+ 7
-
+
True
0
- File name to use, if package.mask/package.unmask is a directory:
+ File name to use, if package.keywords is a directory:
True
- 9
- 10
+ 6
+ 7
-
+
True
- Add only exact version to package.mask/package.unmask
+ Add only exact version to package.keywords
0
True
2
- 8
- 9
+ 5
+ 6
-
+
True
-
-
- True
- 0
- GTK_SHADOW_OUT
-
-
- True
- 0
- <u>You may use the following placeholders:</u>
-
-<i>$(cat)</i>: category
-<i>$(pkg)</i>: package name
-<i>$(cat-1)/$(cat-2)</i>: first/second part of the category
- True
-
-
-
-
-
- label_item
-
-
-
-
+ Add only exact version to package.use
+ 0
+ True
2
+ 2
+ 3
-
- True
- 0
- 5
- <u><i>Use-Flags</i></u>
- True
- True
-
-
- 1
- 2
- 6
-
-
-
-
+
True
0
- 5
- <u><i>Testing Keywords</i></u>
- True
+ File name to use, if package.use is a directory:
True
- 4
- 5
- 5
+ 3
+ 4
-
+
True
- 0
- 5
- <u><i>Masking Keywords</i></u>
- True
- True
- 7
- 8
- 5
+ 1
+ 2
+ 3
+ 4
--
cgit v1.2.3-70-g09d2