From 148255a3007c6743e7e02b8fdd6e6598a2c4cee3 Mon Sep 17 00:00:00 2001 From: necoro <> Date: Tue, 7 Nov 2006 13:02:40 +0000 Subject: re-enabled oneshot; fixes --- geneticone/gui/gtk/glade/geneticone.glade | 319 +++++++++++++++--------------- geneticone/gui/gtk/windows.py | 80 ++++---- geneticone/gui/gtk/wrapper.py | 28 +++ geneticone/gui/gui_helper.py | 46 ++--- geneticone/gui/wrapper.py | 52 +++++ 5 files changed, 310 insertions(+), 215 deletions(-) (limited to 'geneticone') diff --git a/geneticone/gui/gtk/glade/geneticone.glade b/geneticone/gui/gtk/glade/geneticone.glade index b9ce4cc..598ddce 100644 --- a/geneticone/gui/gtk/glade/geneticone.glade +++ b/geneticone/gui/gtk/glade/geneticone.glade @@ -33,6 +33,7 @@ True _Reload Portage True + @@ -222,74 +223,47 @@ 4 2 - + True - GTK_BUTTONBOX_SPREAD - - - True - _Emerge - True - - - - - - True - _Unmerge - True - - - - 1 - - + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC - + True - Re_vert - True - - - 2 - 2 - 3 - 4 + 2 + 3 + 5 - + True - True - <b>Installed, but not in portage anymore</b> - True + + + - 1 - 2 1 2 GTK_FILL - + True - True - <span foreground='red'><b>MISSING KEYWORD</b></span> - True + GTK_JUSTIFY_CENTER + True - 1 2 - 1 - 2 - GTK_FILL + GTK_FILL + GTK_EXPAND + 10 @@ -341,47 +315,74 @@ - + True - GTK_JUSTIFY_CENTER - True + True + <span foreground='red'><b>MISSING KEYWORD</b></span> + True + 1 2 - GTK_FILL - GTK_EXPAND - 10 + 1 + 2 + GTK_FILL - + True - - - + True + <b>Installed, but not in portage anymore</b> + True + 1 + 2 1 2 GTK_FILL - + True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC + GTK_BUTTONBOX_SPREAD - + True + _Emerge + True + + + + True + _Unmerge + True + + + + 1 + + + + + True + Re_vert + True + + + + 2 + + 2 - 2 - 3 - 5 + 3 + 4 @@ -705,186 +706,186 @@ - + 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 - 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 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 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 + 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 @@ -938,4 +939,14 @@ + + True + + + True + oneshot + + + + diff --git a/geneticone/gui/gtk/windows.py b/geneticone/gui/gtk/windows.py index c73394c..98bcba4 100644 --- a/geneticone/gui/gtk/windows.py +++ b/geneticone/gui/gtk/windows.py @@ -481,6 +481,8 @@ class PackageTable: self.actual_package().remove_new_masked() self.actual_package().remove_new_testing() self.cb_combo_changed(self.vCombo) + if self.instantChange: + self._update_keywords(True, update = True) return True def cb_package_emerge_clicked (self, button): @@ -612,8 +614,14 @@ class MainWindow (Window): self.packageTable = PackageTable(self) self.packageTable.table.hide_all() + # popup + popupTree = gtk.glade.XML(DATA_DIR+"geneticone.glade", root = "queuePopup") + popupTree.signal_autoconnect(self) + self.queuePopup = popupTree.get_widget("queuePopup") + # set emerge queue - self.queue = EmergeQueue(console = GtkConsole(term), tree = GtkTree(self.queueList.get_model()), db = self.db) + self.queueTree = GtkTree(self.queueList.get_model()) + self.queue = EmergeQueue(console = GtkConsole(term), tree = self.queueTree, db = self.db) def show_package (self, *args, **kwargs): self.packageTable.update(*args, **kwargs) @@ -706,12 +714,14 @@ class MainWindow (Window): def cb_row_activated (self, view, path, *args): """Callback for an activated row in the emergeQueue. Opens a package window.""" - store = view.get_model() + store = self.queueTree if len(path) > 1: - package = store.get_value(store.get_iter(path), 0) - cat, name, vers, rev = backend.split_package_name(package) - if rev != "r0": vers = vers+"-"+rev - self.show_package(cat+"/"+name, queue = self.queue, version = vers, instantChange = True, doEmerge = False) + iterator = store.get_original().get_iter(path) + if store.is_in_emerge(iterator): + package = store.get_value(iterator, 0) + cat, name, vers, rev = backend.split_package_name(package) + if rev != "r0": vers = vers+"-"+rev + self.show_package(cat+"/"+name, queue = self.queue, version = vers, instantChange = True, doEmerge = False) return True def cb_emerge_clicked (self, action): @@ -784,8 +794,11 @@ class MainWindow (Window): return True def cb_sync_clicked (self, action): - self.notebook.set_current_page(self.CONSOLE_PAGE) - self.queue.sync() + if not backend.am_i_root(): + not_root_dialog() + else: + self.notebook.set_current_page(self.CONSOLE_PAGE) + self.queue.sync() @Window.watch_cursor def cb_reload_clicked (self, action): @@ -818,34 +831,33 @@ class MainWindow (Window): return True def cb_queue_right_click (self, queue, event): - pass - # if event.button == 3: - # x = int(event.x) - # y = int(event.y) - # time = event.time - # pthinfo = queue.get_path_at_pos(x, y) - # if pthinfo is not None: - # path, col, cellx, celly = pthinfo - # queue.grab_focus() - # queue.set_cursor(path, col, 0) - # self.queuePopup.popup(None, None, None, event.button, time) - # return True - # else: - # return False + if event.button == 3: + x = int(event.x) + y = int(event.y) + time = event.time + pthinfo = queue.get_path_at_pos(x, y) + if pthinfo is not None: + path, col, cellx, celly = pthinfo + if self.queueTree.is_in_emerge(self.queueTree.get_original().get_iter(path)): + queue.grab_focus() + queue.set_cursor(path, col, 0) + self.queuePopup.popup(None, None, None, event.button, time) + return True + else: + return False def cb_oneshot_clicked (self, action): - pass - # sel = self.queueList.get_selection() - # store, it = sel.get_selected() - # if it: - # package = store.get_value(it, 0) - # if not self.cfg.get_local(package, self.cfg.const["oneshot_opt"]): - # set = True - # else: - # set = False - # - # self.cfg.set_local(package, self.cfg.const["oneshot_opt"], set) - # self.queue.append(package, update = True, oneshot = set, forceUpdate = True) + sel = self.queueList.get_selection() + store, it = sel.get_selected() + if it: + package = store.get_value(it, 0) + if not self.cfg.get_local(package, self.cfg.const["oneshot_opt"]): + set = True + else: + set = False + + self.cfg.set_local(package, self.cfg.const["oneshot_opt"], set) + self.queue.append(package, update = True, oneshot = set, forceUpdate = True) def cb_destroy (self, widget): """Calls main_quit().""" diff --git a/geneticone/gui/gtk/wrapper.py b/geneticone/gui/gtk/wrapper.py index 6f3cdd8..7597a8a 100644 --- a/geneticone/gui/gtk/wrapper.py +++ b/geneticone/gui/gtk/wrapper.py @@ -25,6 +25,34 @@ class GtkTree (Tree): self.tree = tree self.cpv_col = col + self.emergeIt = self.append(None, ["Emerge", ""]) + self.unmergeIt = self.append(None, ["Unmerge", ""]) + + def build_append_value (self, cpv, oneshot = False, update = False, version = None): + string = "" + + if oneshot: + string += "oneshot" + if update: string += "; " + + if update: + string += "updating" + if version != None: + string += " from version %s" % version + + return [cpv, string] + + def get_emerge_it (self): + return self.emergeIt + + def get_unmerge_it (self): + return self.unmergeIt + + def is_in_emerge (self, it): + return self.get_path_from_iter(it).split(":")[0] == self.get_path_from_iter(self.emergeIt) + + def is_in_unmerge (self, it): + return self.get_path_from_iter(it).split(":")[0] == self.get_path_from_iter(self.unmergeIt) def iter_has_parent (self, it): return (self.tree.iter_parent(it) != None) diff --git a/geneticone/gui/gui_helper.py b/geneticone/gui/gui_helper.py index 81e26ef..3e41501 100644 --- a/geneticone/gui/gui_helper.py +++ b/geneticone/gui/gui_helper.py @@ -246,10 +246,10 @@ class EmergeQueue: self.db = db - # our iterators pointing at the toplevels; they are set to None if do not have a tree + # our iterators pointing at the toplevels; they are set to None if we do not have a tree if self.tree: - self.emergeIt = self.tree.append(None, ["Emerge", ""]) - self.unmergeIt = self.tree.append(None, ["Unmerge", ""]) + self.emergeIt = self.tree.get_emerge_it() + self.unmergeIt = self.tree.get_unmerge_it() else: self.emergeIt = self.unmergeIt = None @@ -287,7 +287,7 @@ class EmergeQueue: return pkg - def update_tree (self, it, cpv, unmask = False, options = None): + def update_tree (self, it, cpv, unmask = False, oneshot = False): """This updates the tree recursivly, or? Isn't it? Bjorn! @param it: iterator where to append @@ -296,24 +296,25 @@ class EmergeQueue: @type cpv: string (cat/pkg-ver) @param unmask: True if we are allowed to look for masked packages @type unmask: boolean - @param options: options to append to the tree - @type options: string[] + @param oneshot: True if we want to emerge is oneshot + @type oneshot: boolean @raises backend.BlockedException: When occured during dependency-calculation. @raises backend.PackageNotFoundException: If no package could be found - normally it is existing but masked.""" - if not options: options = [] - if cpv in self.deps: return # in list already and therefore it's already in the tree too + update = False + uVersion = None try: pkg = self._get_pkg_from_cpv(cpv, unmask) if not pkg.is_installed(): old = backend.get_all_installed_versions(pkg.get_cp()) if old: old = old[0] # assume we have only one there; FIXME: slotted packages - options += ["updating from "+old.get_version()] + update = True + uVersion = old.get_version() except backend.PackageNotFoundException, e: # package not found / package is masked -> delete current tree and re-raise the exception if self.tree.iter_has_parent(it): @@ -323,7 +324,7 @@ class EmergeQueue: raise e # add iter - subIt = self.tree.append(it, [cpv, ""+" ".join(options)+""]) + subIt = self.tree.append(it, self.tree.build_append_value(cpv, oneshot = oneshot, update = update, version = uVersion)) self.iters.update({cpv: subIt}) # get dependencies @@ -339,7 +340,7 @@ class EmergeQueue: self.remove_with_children(subIt) raise e - def append (self, cpv, unmerge = False, update = False, forceUpdate = False, unmask = False, oneshot = False, options = []): + def append (self, cpv, unmerge = False, update = False, forceUpdate = False, unmask = False, oneshot = False): """Appends a cpv either to the merge queue or to the unmerge-queue. Also updates the tree-view. @@ -355,8 +356,6 @@ class EmergeQueue: @type unmask: boolean @param oneshot: True if this package should not be added to the world-file. @type oneshot: boolean - @param options: additional options to get showed in tree - @type options: string[] @raises geneticone.backend.PackageNotFoundException: if trying to add a package which does not exist""" @@ -376,18 +375,18 @@ class EmergeQueue: self.remove_with_children(self.iters[cpv], removeNewFlags = False) if hasBeenInQueue: # package has been in queue before - options += self._queue_append(cpv, oneshot) + self._queue_append(cpv, oneshot) - self.update_tree(parentIt, cpv, unmask, options = options) + self.update_tree(parentIt, cpv, unmask, oneshot = oneshot) else: # not update - options += self._queue_append(cpv, oneshot) + self._queue_append(cpv, oneshot) if self.emergeIt: - self.update_tree(self.emergeIt, cpv, unmask, options) + self.update_tree(self.emergeIt, cpv, unmask, oneshot = oneshot) else: # unmerge self.unmergequeue.append(cpv) if self.unmergeIt: # update tree - self.tree.append(self.unmergeIt, [cpv, ""]) + self.tree.append(self.unmergeIt, self.tree.build_append_value(cpv)) def _queue_append (self, cpv, oneshot = False): """Convenience function appending a cpv either to self.mergequeue or to self.oneshotmerge. @@ -395,19 +394,12 @@ class EmergeQueue: @param cpv: cpv to add @type cpv: string (cpv) @param oneshot: True if this package should not be added to the world-file. - @type oneshot: boolean + @type oneshot: boolean""" - @returns: options set - @rtype: string[]""" - - options = [] if not oneshot: self.mergequeue.append(cpv) else: self.oneshotmerge.append(cpv) - options.append("oneshot") - - return options def _update_packages(self, packages, process = None): """This updates the packages-list. It simply makes the db to rebuild the specific category. @@ -558,7 +550,7 @@ class EmergeQueue: if self.tree.iter_has_parent(it): # NEVER remove our top stuff cpv = self.tree.get_value(it, self.tree.get_cpv_column()) - if self.tree.get_path_from_iter(it).split(":")[0] == self.tree.get_path_from_iter(self.emergeIt): # in Emerge + if self.tree.is_in_emerge(it): # Emerge del self.iters[cpv] try: del self.deps[cpv] diff --git a/geneticone/gui/wrapper.py b/geneticone/gui/wrapper.py index fd69e82..3616d21 100644 --- a/geneticone/gui/wrapper.py +++ b/geneticone/gui/wrapper.py @@ -106,6 +106,10 @@ class Tree: @rtype: tree-object""" raise NotImplementedError + # + # the "design" part + # + def get_cpv_column (self): """Returns the number of the column where the cpv's are stored. @@ -113,6 +117,54 @@ class Tree: @rtype: int""" raise NotImplementedError + def is_in_emerge (self, it): + """Checks whether an iterator is part of the "Emerge" section. + + @param it: the iterator to check + @type it: Iterator + @returns: True if the iter is part; False otherwise + @rtype: boolean""" + raise NotImplementedError + + def is_in_unmerge (self, it): + """Checks whether an iterator is part of the "Unmerge" section. + + @param it: the iterator to check + @type it: Iterator + @returns: True if the iter is part; False otherwise + @rtype: boolean""" + raise NotImplementedError + + def get_emerge_it (self): + """Returns an iterator signaling the top of the emerge section. + + @returns: emerge-iterator + @rtype: Iterator""" + raise NotImplementedError + + def get_unmerge_it (self): + """Returns an iterator signaling the top of the unmerge section. + + @returns: unmerge-iterator + @rtype: Iterator""" + raise NotImplementedError + + def build_append_value (self, cpv, oneshot = False, update = False, version = None): + """Builds the list, which is going to be passed to append. + + @param cpv: the cpv + @type cpv: string (cpv) + @param oneshot: True if oneshot + @type oneshot: boolean + @param update: True if this is an update + @type update: boolean + @param version: the version we update from + @type version: string + + @returns: the created list + @rtype: list""" + raise NotImplementedError + class Console: """This represents the abstract of a console. It should be used for all operations not in a specific frontend, where a console is needed. Each frontend _MUST_ define its own subclass and implement ALL of the methods, otherwise a NotImplementedError will be thrown.""" -- cgit v1.2.3-54-g00ecf