October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52555 - /tags/stable-2_17_3/power-management/
by jsrain＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: jsrain Date: Mon Oct 27 10:10:50 2008 New Revision: 52555 URL: http://svn.opensuse.org/viewcvs/yast?rev=52555&view=rev Log: Created tag stable-2_17_3 for power-management Added: tags/stable-2_17_3/power-management/ (props changed) - copied from r52554, trunk/power-management/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52554 - in /trunk/power-management: VERSION agents/etc_pm-profiler_profiles.scr package/yast2-power-management.changes yast2-power-management.spec.in
by jsrain＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: jsrain Date: Mon Oct 27 10:04:55 2008 New Revision: 52554 URL: http://svn.opensuse.org/viewcvs/yast?rev=52554&view=rev Log: match patch of profile configuration files (bnc #438686) set package to noarch Modified: trunk/power-management/VERSION trunk/power-management/agents/etc_pm-profiler_profiles.scr trunk/power-management/package/yast2-power-management.changes trunk/power-management/yast2-power-management.spec.in Modified: trunk/power-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/VERSION?rev=525… ============================================================================== --- trunk/power-management/VERSION (original) +++ trunk/power-management/VERSION Mon Oct 27 10:04:55 2008 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: trunk/power-management/agents/etc_pm-profiler_profiles.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/agents/etc_pm-p… ============================================================================== --- trunk/power-management/agents/etc_pm-profiler_profiles.scr (original) +++ trunk/power-management/agents/etc_pm-profiler_profiles.scr Mon Oct 27 10:04:55 2008 @@ -1,7 +1,7 @@ .etc.pm-profiler.profiles `ag_ini( - `IniAgent( [ "/etc/pm-profiler/*" ], + `IniAgent( [ "/etc/pm-profiler/*/config" ], $[ /* values at the top level, allow comments after value */ "options" : [ "global_values" ], @@ -15,7 +15,7 @@ ], /* matching rules */ "rewrite" : [ - [ "/etc/pm-profiler/(.*)", "/etc/pm-profiler/%s" ], + [ "/etc/pm-profiler/(.*)/config", "/etc/pm-profiler/%s/config" ], ], ] )) Modified: trunk/power-management/package/yast2-power-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/package/yast2-p… ============================================================================== --- trunk/power-management/package/yast2-power-management.changes (original) +++ trunk/power-management/package/yast2-power-management.changes Mon Oct 27 10:04:55 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 27 09:35:30 CET 2008 - jsrain(a)suse.cz + +- match patch of profile configuration files (bnc #438686) +- set package to noarch +- 2.17.3 + +------------------------------------------------------------------- Fri Sep 26 10:59:29 CEST 2008 - jsrain(a)suse.cz - removed superfluous include of unexistent file (bnc #429541) Modified: trunk/power-management/yast2-power-management.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/yast2-power-man… ============================================================================== --- trunk/power-management/yast2-power-management.spec.in (original) +++ trunk/power-management/yast2-power-management.spec.in Mon Oct 27 10:04:55 2008 @@ -3,6 +3,7 @@ @HEADER@ BuildRequires: update-desktop-files yast2-devtools yast2-testsuite perl-XML-Writer yast2 Requires: gettext +BuildArchitectures: noarch # .etc.policykit agent Requires: yast2 >= 2.14.7 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52553 - /tags/stable-2_17_8/kdump/
by juhliarik＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: juhliarik Date: Mon Oct 27 09:20:00 2008 New Revision: 52553 URL: http://svn.opensuse.org/viewcvs/yast?rev=52553&view=rev Log: Created tag stable-2_17_8 for kdump Added: tags/stable-2_17_8/kdump/ - copied from r52552, trunk/kdump/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52552 - /trunk/kdump/VERSION
by juhliarik＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: juhliarik Date: Mon Oct 27 09:19:49 2008 New Revision: 52552 URL: http://svn.opensuse.org/viewcvs/yast?rev=52552&view=rev Log: new version 2.17.8 Modified: trunk/kdump/VERSION Modified: trunk/kdump/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/VERSION?rev=52552&r1=52551… ============================================================================== --- trunk/kdump/VERSION (original) +++ trunk/kdump/VERSION Mon Oct 27 09:19:49 2008 @@ -1 +1 @@ -2.17.7 +2.17.8 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52551 - in /trunk/storage/storage/src/include: ep-hd-lib.ycp ep-lvm-lib.ycp
by aschnell＠svn.opensuse.org 26 Oct '08

26 Oct '08

Author: aschnell Date: Sun Oct 26 21:54:22 2008 New Revision: 52551 URL: http://svn.opensuse.org/viewcvs/yast?rev=52551&view=rev Log: - no need to update navigation tree after resize of partition or lvm lv Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/include/ep-lvm-lib.ycp Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Sun Oct 26 21:54:22 2008 @@ -279,7 +279,6 @@ target_map = Storage::SetPartition(target_map, data); Storage::SetTargetMap(target_map); - UpdateNavigationTree(nil); TreePanel::Create(); UpdateTableFocus(device); } Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Sun Oct 26 21:54:22 2008 @@ -246,7 +246,6 @@ target_map = Storage::SetPartition(target_map, data); Storage::SetTargetMap(target_map); - UpdateNavigationTree(nil); TreePanel::Create(); UpdateTableFocus(device); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52550 - in /trunk/gtk: ChangeLog src/YGPackageSelector.cc src/yzyppwrapper.cc src/yzyppwrapper.h
by rpmcruz＠svn.opensuse.org 26 Oct '08

26 Oct '08

Author: rpmcruz Date: Sun Oct 26 19:09:59 2008 New Revision: 52550 URL: http://svn.opensuse.org/viewcvs/yast?rev=52550&view=rev Log: * src/YGPackageSelector.cc (Categories): ensure Categories item visibility when the pane forces the list size to be reduced. * src/yzyppwrapper.h/cc: added build-age to description, and such criteria to the pool query. * src/YGPackageSelector.cc (Categories): recent spin button. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/yzyppwrapper.cc trunk/gtk/src/yzyppwrapper.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52550&r1=52549… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sun Oct 26 19:09:59 2008 @@ -1,9 +1,19 @@ +2008-10-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGPackageSelector.cc (Categories): ensure Categories item + visibility when the pane forces the list size to be reduced. + + * src/yzyppwrapper.h/cc: added build-age to description, and + such criteria to the pool query. + + * src/YGPackageSelector.cc (Categories): recent spin button. + 2008-10-24 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> - * src/YGPackageSelector (ListView): shortcut: when row activated + * src/YGPackageSelector.cc (ListView): shortcut: when row activated (double-click or space) install the package. - * src/YGDialog (setMinSize): fixed height. + * src/YGDialog.cc (setMinSize): fixed height. * src/yzyppwrapper.h/cc: added Package::support() and notifyMesage() interface in order to support ResObject::insnotify() and delnotify(). Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Sun Oct 26 19:09:59 2008 @@ -65,6 +65,36 @@ return ptr == NULL; } +static void ensure_visible_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc) +{ + GList *paths; + if (GTK_IS_TREE_VIEW (widget)) { + GtkTreeView *view = GTK_TREE_VIEW (widget); + GtkTreeSelection *selection = gtk_tree_view_get_selection (view); + paths = gtk_tree_selection_get_selected_rows (selection, NULL); + if (paths && !paths->next) { + GtkTreePath *path = (GtkTreePath *) paths->data; + gtk_tree_view_scroll_to_cell (view, path, NULL, FALSE, 0, 0); + } + } + else { // if (GTK_IS_ICON_VIEW (widget)) + GtkIconView *view = GTK_ICON_VIEW (widget); + paths = gtk_icon_view_get_selected_items (view); + if (paths && !paths->next) { + GtkTreePath *path = (GtkTreePath *) paths->data; + gtk_icon_view_scroll_to_path (view, path, FALSE, 0, 0); + } + } + g_list_foreach (paths, (GFunc) gtk_tree_path_free, 0); + g_list_free (paths); +} + +static void ensure_view_visible_hook (GtkWidget *widget /* tree view or icon view */) +{ + g_signal_connect_after (G_OBJECT (widget), "size-allocate", + G_CALLBACK (ensure_visible_size_allocate_cb), NULL); +} + const char *lock_tooltip = "Package lock: prevents the package status from being modified by " "the solver (that is, it won't honour dependencies or collections ties.)"; @@ -250,7 +280,6 @@ virtual GList *getSelectedPaths (GtkTreeModel **model) = 0; virtual void selectAll() = 0; virtual void unselectAll() = 0; - virtual void ensureVisible (GtkTreePath *path) = 0; virtual int countSelected() { @@ -394,15 +423,6 @@ static gboolean popup_key_cb (GtkWidget *widget, View *pThis) { pThis->signalPopup (0, gtk_get_current_event_time()); return TRUE; } - - static void size_allocated_cb (GtkWidget *widget, GtkAllocation *alloc, View *pThis) - { - GList *paths = pThis->getSelectedPaths (NULL); - if (paths && !paths->next /* single selection */) - pThis->ensureVisible ((GtkTreePath *) paths->data); - g_list_foreach (paths, (GFunc) gtk_tree_path_free, 0); - g_list_free (paths); - } }; struct ListView : public View { @@ -449,13 +469,12 @@ g_signal_connect (G_OBJECT (m_widget), "button-press-event", G_CALLBACK (popup_button_cb), this); } - g_signal_connect_after (G_OBJECT (m_widget), "size-allocate", - G_CALLBACK (size_allocated_cb), this); if (showTooltips) { gtk_widget_set_has_tooltip (m_widget, TRUE); g_signal_connect (G_OBJECT (m_widget), "query-tooltip", G_CALLBACK (query_tooltip_cb), this); } + ensure_view_visible_hook (m_widget); } virtual void setModel (GtkTreeModel *model) @@ -524,12 +543,6 @@ return package != NULL; } - virtual void ensureVisible (GtkTreePath *path) - { - GtkTreeView *view = GTK_TREE_VIEW (m_widget); - gtk_tree_view_scroll_to_cell (view, path, NULL, FALSE, 0, 0); - } - static gboolean query_tooltip_cb (GtkWidget *view, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer data) { @@ -578,8 +591,7 @@ g_signal_connect_after (G_OBJECT (m_widget), "button-press-event", G_CALLBACK (popup_button_after_cb), this); } - g_signal_connect_after (G_OBJECT (m_widget), "size-allocate", - G_CALLBACK (size_allocated_cb), this); + ensure_view_visible_hook (m_widget); } virtual void setModel (GtkTreeModel *model) @@ -617,12 +629,6 @@ pThis->signalPopup (3, event->time); return FALSE; } - - virtual void ensureVisible (GtkTreePath *path) - { - GtkIconView *view = GTK_ICON_VIEW (m_widget); - gtk_icon_view_scroll_to_path (view, path, FALSE, 0, 0); - } }; GtkWidget *m_bin; @@ -922,7 +928,7 @@ { public: struct Listener { - virtual void collectionChanged() = 0; + virtual void collectionChanged (bool immediate) = 0; }; private: @@ -941,8 +947,8 @@ GtkWidget *getWidget() { return m_box; } - void signalChanged() - { m_listener->collectionChanged(); } + void signalChanged() { m_listener->collectionChanged (true); } + void signalChangedDelay() { m_listener->collectionChanged (false); } protected: GtkWidget *m_box; @@ -1023,6 +1029,7 @@ gtk_container_add (GTK_CONTAINER (m_scroll), m_view); gtk_widget_show (m_view); + ensure_view_visible_hook (m_view); } void block() @@ -1093,6 +1100,7 @@ struct Categories : public StoreView { bool m_patchMode, m_rpmGroups; + GtkWidget *m_daysSpin; public: Categories (Collections::Listener *listener, bool patch_mode) : StoreView (listener), m_patchMode (patch_mode), m_rpmGroups (false) @@ -1106,7 +1114,40 @@ "RPM information.")); g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (rpm_groups_toggled_cb), this); + + struct inner { + static void value_changed_cb (GtkWidget *widget, Categories *pThis) + { pThis->signalChangedDelay(); } + static void days_toggled_cb (GtkToggleButton *button, Categories *pThis) + { + gboolean active = gtk_toggle_button_get_active (button); + gtk_widget_set_sensitive (pThis->m_daysSpin, active); + pThis->signalChangedDelay(); + } + }; + GtkWidget *daysCheck; + daysCheck = gtk_check_button_new_with_label (_("Recent:")); + m_daysSpin = gtk_spin_button_new_with_range (0, 90, 1); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (m_daysSpin), 7); + gtk_widget_set_sensitive (m_daysSpin, FALSE); + g_signal_connect (G_OBJECT (daysCheck), "toggled", + G_CALLBACK (inner::days_toggled_cb), this); + g_signal_connect (G_OBJECT (m_daysSpin), "value-changed", + G_CALLBACK (inner::value_changed_cb), this); + GtkWidget *hbox = gtk_hbox_new (FALSE, 4); + GtkWidget *label = gtk_label_new (_("days")); + gtk_box_pack_start (GTK_BOX (hbox), daysCheck, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), m_daysSpin, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); + YGUtils::setWidgetFont (label, + PANGO_STYLE_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL); + YGUtils::setWidgetFont (m_daysSpin, + PANGO_STYLE_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL); + YGUtils::setWidgetFont (GTK_BIN (daysCheck)->child, + PANGO_STYLE_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL); + gtk_box_pack_start (GTK_BOX (m_box), check, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (m_box), hbox, FALSE, TRUE, 0); } build (m_rpmGroups, !m_rpmGroups, false); } @@ -1157,20 +1198,24 @@ virtual void writeQuery (Ypp::QueryPool::Query *query, const std::list <gpointer> &ptrs) { - if (ptrs.empty()) - return; - gpointer ptr = ptrs.front(); - if (GPOINTER_TO_INT (ptr) == 1) + gpointer ptr = ptrs.empty() ? NULL : ptrs.front(); + int nptr = GPOINTER_TO_INT (ptr); + if (nptr == 1) query->setIsRecommended (true); - else if (GPOINTER_TO_INT (ptr) == 2) + else if (nptr == 2) query->setIsSuggested (true); - else { + else if (ptr) { Ypp::Node *node = (Ypp::Node *) ptr; if (m_rpmGroups || m_patchMode) query->addCategory (node); else query->addCategory2 (node); } + + if (GTK_WIDGET_IS_SENSITIVE (m_daysSpin)) { + int days = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (m_daysSpin)); + query->setBuildAge (days); + } } static void rpm_groups_toggled_cb (GtkToggleButton *button, Categories *pThis) @@ -1532,8 +1577,8 @@ static void field_changed_cb (gpointer widget, Filters *pThis) { pThis->signalChangedDelay(); } - virtual void collectionChanged() - { signalChanged(); } + virtual void collectionChanged (bool immediate) + { immediate ? signalChanged() : signalChangedDelay(); } void signalChanged() { Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5255… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Sun Oct 26 19:09:59 2008 @@ -213,9 +213,10 @@ virtual std::string authors (bool rich) { return ""; } virtual std::string support (bool rich) { return ""; } virtual std::string icon() { return ""; } - virtual bool isRecommended() const { return false; } - virtual bool isSuggested() const { return false; } - virtual bool isUnsupported() const { return false; } + virtual bool isRecommended() const { return false; } + virtual bool isSuggested() const { return false; } + virtual int buildAge() const { return 0; } + virtual bool isUnsupported() const { return false; } virtual std::string provides (bool rich) const { return ""; } virtual std::string requires (bool rich) const { return ""; } @@ -271,10 +272,11 @@ std::string Ypp::Package::icon() { return impl->icon(); } bool Ypp::Package::isRecommended() const { return impl->isRecommended(); } bool Ypp::Package::isSuggested() const { return impl->isSuggested(); } -bool Ypp::Package::isUnsupported() const { return impl->isUnsupported(); } +int Ypp::Package::buildAge() const { return impl->buildAge(); } +bool Ypp::Package::isUnsupported() const { return impl->isUnsupported(); } -std::string Ypp::Package::provides (bool rich) const { return impl->provides (rich); } -std::string Ypp::Package::requires (bool rich) const { return impl->requires (rich); } +std::string Ypp::Package::provides (bool rich) const { return impl->provides (rich); } +std::string Ypp::Package::requires (bool rich) const { return impl->requires (rich); } const Ypp::Package::Version *Ypp::Package::getInstalledVersion() { return impl->getInstalledVersion(); } @@ -448,6 +450,11 @@ #else text += br + "" + _("Size:") + " " + object->installsize().asString(); #endif + if (!isInstalled() || hasUpgrade()) { + text += br + "" + _("Build time:") + " " + m_sel->candidateObj()->buildtime().form("%x"); + if (hasUpgrade()) + text += std::string ("   (") + _("Installed time:") + " " + m_sel->installedObj()->installtime().form("%x") + ")"; + } break; } case Ypp::Package::PATCH_TYPE: @@ -717,6 +724,16 @@ return false; } + virtual int buildAge() const + { + if (m_sel->hasCandidateObj()) { + time_t build = static_cast <time_t> (m_sel->candidateObj()->buildtime()); + time_t now = time (NULL); + return (now - build) / (60*60*24); // in days + } + return -1; + } + virtual bool isUnsupported() const { #if ZYPP_VERSION >= 5013001 @@ -1288,6 +1305,7 @@ Key <bool> toModify; Key <bool> isRecommended; Key <bool> isSuggested; + Key <int> buildAge; Key <bool> isUnsupported; Ypp::Package *highlight; @@ -1337,6 +1355,11 @@ match = isRecommended.is (package->isRecommended()); if (match && isSuggested.defined) match = isSuggested.is (package->isSuggested()); + if (match && buildAge.defined) { + int age = package->buildAge(); + if (age < 0 || age > buildAge.value) + match = false; + } if (match && isUnsupported.defined) match = isUnsupported.is (package->isUnsupported()); if (match && names.defined) { @@ -1472,6 +1495,8 @@ { impl->isRecommended.set (value); } void Ypp::QueryPool::Query::setIsSuggested (bool value) { impl->isSuggested.set (value); } +void Ypp::QueryPool::Query::setBuildAge (int value) +{ impl->buildAge.set (value); } void Ypp::QueryPool::Query::setIsUnsupported (bool value) { impl->isUnsupported.set (value); } Modified: trunk/gtk/src/yzyppwrapper.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.h?rev=52550… ============================================================================== --- trunk/gtk/src/yzyppwrapper.h (original) +++ trunk/gtk/src/yzyppwrapper.h Sun Oct 26 19:09:59 2008 @@ -61,6 +61,7 @@ std::string icon(); bool isRecommended() const; bool isSuggested() const; + int buildAge() const; // if < 0 , unsupported or error bool isUnsupported() const; std::string provides (bool rich) const; @@ -155,6 +156,7 @@ void setToModify (bool modify); void setIsRecommended (bool recommended); void setIsSuggested (bool suggested); + void setBuildAge (int days); void setIsUnsupported (bool unsupported); ~Query(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52549 - /trunk/gtk/src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 26 Oct '08

26 Oct '08

Author: rpmcruz Date: Sun Oct 26 06:30:52 2008 New Revision: 52549 URL: http://svn.opensuse.org/viewcvs/yast?rev=52549&view=rev Log: src/yzyppwrapper.cc (YPackage::description): Moved vendor to packager. Modified: trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5254… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Sun Oct 26 06:30:52 2008 @@ -627,14 +627,23 @@ } authors += str; } - if (rich) { if (!authors.empty()) text += _("Developed by:") + ("<blockquote>" + authors) + "</blockquote>"; - if (!packager.empty()) - text += _("Packaged by:") + ("<blockquote>" + packager) + "</blockquote>"; - if (!vendor.empty() && !text.empty() /*doesn't make much sense alone*/) - text += _("Vendor:") + ("<blockquote>" + vendor) + "</blockquote>"; + if (!packager.empty() || (!vendor.empty() && !text.empty())) { + text += _("Packaged by:"); + text += "<blockquote>"; + if (!packager.empty()) + text += packager; + if (!vendor.empty()) { + if (!packager.empty()) + text += " ("; + text += vendor; + if (!packager.empty()) + text += ")"; + } + text += "</blockquote>"; + } } else return authors; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52548 - /trunk/gtk/src/YGPackageSelector.cc
by rpmcruz＠svn.opensuse.org 25 Oct '08

25 Oct '08

Author: rpmcruz Date: Sun Oct 26 01:46:09 2008 New Revision: 52548 URL: http://svn.opensuse.org/viewcvs/yast?rev=52548&view=rev Log: AcceptText(): Disable custom markup on primary text. Modified: trunk/gtk/src/YGPackageSelector.cc Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Sun Oct 26 01:46:09 2008 @@ -2624,10 +2624,10 @@ bool acceptText (Ypp::Package *package, const std::string &title, const std::string &open, const std::string &text, bool question) { - GtkWidget *dialog = gtk_message_dialog_new_with_markup (YGDialog::currentWindow(), + GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), (GtkDialogFlags) 0, question ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO, question ? GTK_BUTTONS_YES_NO : GTK_BUTTONS_OK, - "%s %s", package->name().c_str(), title.c_str()); + "%s %s", package->name().c_str(), title.c_str()); if (!open.empty()) gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", open.c_str()); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52547 - in /trunk/storage/libstorage/src: AppUtil.cc StorageInterface.h
by aschnell＠svn.opensuse.org 25 Oct '08

25 Oct '08

Author: aschnell Date: Sat Oct 25 15:33:30 2008 New Revision: 52547 URL: http://svn.opensuse.org/viewcvs/yast?rev=52547&view=rev Log: - tiny refactoring Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/StorageInterface.h Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Sat Oct 25 15:33:30 2008 @@ -624,24 +624,13 @@ if (s.fail() || !s.eof() || f < 0.0) return false; - for(int i = 0; i < numSuffixes(); i++) + for (int i = 0; i < numSuffixes(); i++) { - if (classic) + if (boost::equals(suffix, getSuffix(i, classic, false), boost::is_iequal(loc)) || + (!classic && boost::equals(suffix, getSuffix(i, classic, true), boost::is_iequal(loc)))) { - if (boost::equals(suffix, getSuffix(i, true), boost::is_equal())) - { - size = f; - return true; - } - } - else - { - if (boost::equals(suffix, getSuffix(i, false, false), boost::is_iequal(loc)) || - boost::equals(suffix, getSuffix(i, false, true), boost::is_iequal(loc))) - { - size = f; - return true; - } + size = f; + return true; } f *= 1024.0; Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Sat Oct 25 15:33:30 2008 @@ -2111,7 +2111,7 @@ /** * Return a pretty description of a size with required precision - * and using B, kB, MB, GB or TB as unit as appropriate. + * and using B, kB, MB, GB, TB or PB as unit as appropriate. * * @param size size in bytes * @param classic use classic locale @@ -2123,15 +2123,15 @@ bool omit_zeroes) const = 0; /** - * Converts a size description using B, kB, MB, GB or TB into an integer. + * Converts a size description using B, kB, MB, GB, TB or PB into an integer. * * @param str size string * @param classic use classic locale * @param size size in bytes * @return true on successful conversion * - * With classic set to false the conversion is also case-insensitive - * and sloppy concerning omission of 'B'. + * The conversion is always case-insensitive. With classic set to + * false the conversion is also sloppy concerning omission of 'B'. */ virtual bool humanStringToByte(const string& str, bool classic, unsigned long long& size) const = 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52546 - /tags/stable-2_17_9/registration/
by jdsn＠svn.opensuse.org 24 Oct '08

24 Oct '08

Author: jdsn Date: Fri Oct 24 23:41:50 2008 New Revision: 52546 URL: http://svn.opensuse.org/viewcvs/yast?rev=52546&view=rev Log: Created tag stable-2_17_9 for registration Added: tags/stable-2_17_9/registration/ - copied from r52545, trunk/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0