October 2008 - YaST Commits - openSUSE Mailing Lists

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

28 Oct '08

Author: rpmcruz Date: Tue Oct 28 15:03:43 2008 New Revision: 52625 URL: http://svn.opensuse.org/viewcvs/yast?rev=52625&view=rev Log: * src/YGPackageSelector.cc: honor enableRepoMgr flag. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelector.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52625&r1=52624… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Oct 28 15:03:43 2008 @@ -11,6 +11,8 @@ accurate, but it features disabled repositories, so use it for that purpose. + * src/YGPackageSelector.cc: honor enableRepoMgr flag. + 2008-10-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc (Categories): ensure Categories item 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 Tue Oct 28 15:03:43 2008 @@ -1190,7 +1190,7 @@ struct Repositories : public StoreView { public: - Repositories (Collections::Listener *listener) + Repositories (Collections::Listener *listener, bool repoMgrEnabled) : StoreView (listener) { GtkWidget *align, *button, *box, *image, *label; @@ -1340,7 +1340,7 @@ GtkWidget *getWidget() { return m_bin; } - void setType (Type type, bool patch_mode) + void setType (Type type, bool patch_mode, bool repo_mgr_enabled) { if (m_view) gtk_container_remove (GTK_CONTAINER (m_bin), m_view->getWidget()); @@ -1358,7 +1358,7 @@ m_view = new Pool (m_listener, Ypp::Package::LANGUAGE_TYPE); break; default: - m_view = new Repositories (m_listener); + m_view = new Repositories (m_listener, repo_mgr_enabled); break; } @@ -1514,7 +1514,7 @@ G_CALLBACK (type_changed_cb), this); m_collection = new Collections (this); - m_collection->setType (Collections::GROUPS_TYPE, updateMode); + m_collection->setType (Collections::GROUPS_TYPE, updateMode, enableRepoMgr); } ~Filters() @@ -1540,7 +1540,8 @@ int type = gtk_combo_box_get_active (combo); if (pThis->m_updateMode && type == 1) type = Collections::REPOS_TYPE; - pThis->m_collection->setType ((Collections::Type) type, pThis->m_updateMode); + pThis->m_collection->setType ((Collections::Type) type, + pThis->m_updateMode, pThis->m_enableRepoMgr); pThis->signalChangedDelay(); } -- 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] r52624 - in /trunk/storage/libstorage/src: DmPart.cc Dmmultipath.cc DmmultipathCo.cc Dmraid.cc DmraidCo.cc
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 13:40:38 2008 New Revision: 52624 URL: http://svn.opensuse.org/viewcvs/yast?rev=52624&view=rev Log: - some cleanup (while analysing bugs) Modified: trunk/storage/libstorage/src/DmPart.cc trunk/storage/libstorage/src/Dmmultipath.cc trunk/storage/libstorage/src/DmmultipathCo.cc trunk/storage/libstorage/src/Dmraid.cc trunk/storage/libstorage/src/DmraidCo.cc Modified: trunk/storage/libstorage/src/DmPart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPart.cc… ============================================================================== --- trunk/storage/libstorage/src/DmPart.cc (original) +++ trunk/storage/libstorage/src/DmPart.cc Tue Oct 28 13:40:38 2008 @@ -14,9 +14,10 @@ using namespace storage; using namespace std; -DmPart::DmPart( const DmPartCo& d, unsigned nr, Partition* pa ) : - Dm( d, "" ) - { + +DmPart::DmPart(const DmPartCo& d, unsigned nr, Partition* pa) + : Dm(d, "") +{ init( d.numToName(nr) ); numeric = true; num = nr; @@ -24,14 +25,15 @@ p = pa; if( pa ) setSize( pa->sizeK() ); - y2milestone( "constructed DmPart %s on co %s", dev.c_str(), - cont->name().c_str() ); - } + y2mil("constructed DmPart " << dev << " on co " << cont->name()); +} + DmPart::~DmPart() - { - y2debug( "destructed DmPart %s", dev.c_str() ); - } +{ + y2deb("destructed DmPart " << dev); +} + void DmPart::init( const string& name ) { @@ -187,16 +189,18 @@ y2mil(log); } -DmPart& DmPart::operator= ( const DmPart& rhs ) - { - y2debug( "operator= from %s", rhs.nm.c_str() ); + +DmPart& DmPart::operator=(const DmPart& rhs) +{ + y2deb("operator= from " << rhs.nm); *((Dm*)this) = rhs; - return( *this ); - } + return *this; +} -DmPart::DmPart( const DmPartCo& d, const DmPart& rhs ) : Dm(d,rhs) - { - y2debug( "constructed dmraid by copy constructor from %s", - rhs.dev.c_str() ); + +DmPart::DmPart(const DmPartCo& d, const DmPart& rhs) + : Dm(d, rhs) +{ + y2deb("constructed dmraid by copy constructor from " << rhs.dev); *this = rhs; - } +} Modified: trunk/storage/libstorage/src/Dmmultipath.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/Dmmultipath.cc (original) +++ trunk/storage/libstorage/src/Dmmultipath.cc Tue Oct 28 13:40:38 2008 @@ -13,17 +13,19 @@ using namespace storage; using namespace std; -Dmmultipath::Dmmultipath( const DmmultipathCo& d, unsigned nr, Partition* p ) : - DmPart( d, nr, p ) - { - y2milestone( "constructed dmmultipath %s on co %s", dev.c_str(), - cont->name().c_str() ); - } + +Dmmultipath::Dmmultipath(const DmmultipathCo& d, unsigned nr, Partition* p) + : DmPart(d, nr, p) +{ + y2mil("constructed dmmultipath " << dev << " on co " << cont->name()); +} + Dmmultipath::~Dmmultipath() - { - y2debug( "destructed dmmultipath %s", dev.c_str() ); - } +{ + y2deb("destructed dmmultipath " << dev); +} + string Dmmultipath::removeText( bool doing ) const { @@ -242,10 +244,10 @@ DmPart::logDifference(rhs); } -Dmmultipath& Dmmultipath::operator= ( const Dmmultipath& rhs ) - { - y2debug( "operator= from %s", rhs.nm.c_str() ); - *((DmPart*)this) = rhs; - return( *this ); - } +Dmmultipath& Dmmultipath::operator=(const Dmmultipath& rhs) +{ + y2deb("operator= from " << rhs.nm); + *((DmPart*)this) = rhs; + return *this; +} Modified: trunk/storage/libstorage/src/DmmultipathCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/DmmultipathCo.cc (original) +++ trunk/storage/libstorage/src/DmmultipathCo.cc Tue Oct 28 13:40:38 2008 @@ -290,4 +290,3 @@ void DmmultipathCo::logData( const string& Dir ) {} bool DmmultipathCo::active = false; - Modified: trunk/storage/libstorage/src/Dmraid.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmraid.cc… ============================================================================== --- trunk/storage/libstorage/src/Dmraid.cc (original) +++ trunk/storage/libstorage/src/Dmraid.cc Tue Oct 28 13:40:38 2008 @@ -13,17 +13,19 @@ using namespace storage; using namespace std; -Dmraid::Dmraid( const DmraidCo& d, unsigned nr, Partition* p ) : - DmPart( d, nr, p ) - { - y2milestone( "constructed dmraid %s on co %s", dev.c_str(), - cont->name().c_str() ); - } + +Dmraid::Dmraid(const DmraidCo& d, unsigned nr, Partition* p) + : DmPart(d, nr, p) +{ + y2mil("constructed dmraid " << dev << " on co " << cont->name()); +} + Dmraid::~Dmraid() - { - y2debug( "destructed dmraid %s", dev.c_str() ); - } +{ + y2deb("destructed dmraid " << dev); +} + string Dmraid::removeText( bool doing ) const { @@ -94,7 +96,7 @@ txt = sformat( _("Create extended raid partition %1$s (%2$s)"), d.c_str(), sizeString().c_str() ); } - else + else { // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) @@ -155,7 +157,7 @@ // %2$s is replaced by size (e.g. 623.5 MB) // %3$s is replaced by file system type (e.g. reiserfs) txt = sformat( _("Format raid partition %1$s (%2$s) with %3$s"), - d.c_str(), sizeString().c_str(), + d.c_str(), sizeString().c_str(), fsTypeString().c_str() ); } } @@ -242,10 +244,10 @@ DmPart::logDifference(rhs); } -Dmraid& Dmraid::operator= ( const Dmraid& rhs ) - { - y2debug( "operator= from %s", rhs.nm.c_str() ); - *((DmPart*)this) = rhs; - return( *this ); - } +Dmraid& Dmraid::operator=(const Dmraid& rhs) +{ + y2deb("operator= from " << rhs.nm); + *((DmPart*)this) = rhs; + return *this; +} Modified: trunk/storage/libstorage/src/DmraidCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmraidCo.… ============================================================================== --- trunk/storage/libstorage/src/DmraidCo.cc (original) +++ trunk/storage/libstorage/src/DmraidCo.cc Tue Oct 28 13:40:38 2008 @@ -2,8 +2,8 @@ Textdomain "storage" */ -#include <iostream> -#include <sstream> +#include <iostream> +#include <sstream> #include "y2storage/DmraidCo.h" #include "y2storage/Dmraid.h" @@ -15,18 +15,21 @@ using namespace std; using namespace storage; -DmraidCo::DmraidCo( Storage * const s, const string& Name, ProcPart& ppart ) : - DmPartCo(s, "/dev/mapper/"+Name, staticType(), ppart ) - { - DmPartCo::init( ppart ); - getRaidData( Name ); - y2debug( "constructing dmraid co %s", Name.c_str() ); - } + +DmraidCo::DmraidCo(Storage * const s, const string& Name, ProcPart& ppart) + : DmPartCo(s, "/dev/mapper/"+Name, staticType(), ppart) +{ + DmPartCo::init(ppart); + getRaidData(Name); + y2deb("constructing dmraid co " << Name); +} + DmraidCo::~DmraidCo() - { - y2debug( "destructed raid co %s", dev.c_str() ); - } +{ + y2deb("destructed raid co " << dev); +} + void DmraidCo::getRaidData( const string& name ) { @@ -91,7 +94,7 @@ void -DmraidCo::newP( DmPart*& dm, unsigned num, Partition* p ) +DmraidCo::newP( DmPart*& dm, unsigned num, Partition* p ) { y2mil( "num:" << num ); dm = new Dmraid( *this, num, p ); @@ -273,5 +276,3 @@ void DmraidCo::logData( const string& Dir ) {;} bool DmraidCo::active = false; - - -- 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] r52623 - /trunk/audit-laf/src/complex.ycp
by gs＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: gs Date: Tue Oct 28 10:20:33 2008 New Revision: 52623 URL: http://svn.opensuse.org/viewcvs/yast?rev=52623&view=rev Log: replace AskForExistingFile by AskForSaveFileName (log file name) Modified: trunk/audit-laf/src/complex.ycp Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=52… ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Tue Oct 28 10:20:33 2008 @@ -119,7 +119,7 @@ if ( action == "select_file" ) { - string file_name = UI::AskForExistingFile("/var/log/audit", "*.log", _("Select the log file") ); + string file_name = UI::AskForSaveFileName("/var/log/audit", "*.log", _("Select the log file") ); UI::ChangeWidget( `id("log_file"), `Value, file_name ); y2milestone( "Logfile set to: %1", file_name ); -- 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] r52622 - in /trunk/storage/libstorage/src: DmmultipathCo.cc StorageDefines.h
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 10:14:16 2008 New Revision: 52622 URL: http://svn.opensuse.org/viewcvs/yast?rev=52622&view=rev Log: - also start/stop multipathd Modified: trunk/storage/libstorage/src/DmmultipathCo.cc trunk/storage/libstorage/src/StorageDefines.h Modified: trunk/storage/libstorage/src/DmmultipathCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/DmmultipathCo.cc (original) +++ trunk/storage/libstorage/src/DmmultipathCo.cc Tue Oct 28 10:14:16 2008 @@ -140,9 +140,13 @@ c.execute(MODPROBEBIN " dm-multipath"); c.execute(MULTIPATHBIN); + sleep(1); + c.execute(MULTIPATHDBIN); } else { + c.execute(MULTIPATHDBIN " -F"); + sleep(1); c.execute(MULTIPATHBIN " -F"); } Modified: trunk/storage/libstorage/src/StorageDefines.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageDe… ============================================================================== --- trunk/storage/libstorage/src/StorageDefines.h (original) +++ trunk/storage/libstorage/src/StorageDefines.h Tue Oct 28 10:14:16 2008 @@ -31,6 +31,7 @@ #define CRYPTSETUPBIN "/sbin/cryptsetup" #define LOSETUPBIN "/sbin/losetup" #define MULTIPATHBIN "/sbin/multipath" +#define MULTIPATHDBIN "/sbin/multipathd" #define DMSETUPBIN "/sbin/dmsetup" #define KPARTXBIN "/sbin/kpartx" #define DMRAIDBIN "/sbin/dmraid" -- 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] r52621 - /trunk/gtk/src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: rpmcruz Date: Tue Oct 28 03:04:12 2008 New Revision: 52621 URL: http://svn.opensuse.org/viewcvs/yast?rev=52621&view=rev Log: src/yzyppwrapper.cc: re-formatted installed/build time. 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=5262… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Tue Oct 28 03:04:12 2008 @@ -450,11 +450,19 @@ #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") + ")"; + + bool hasCandidate = m_sel->hasCandidateObj(); + if (isInstalled()) { + text += br + "" + _("Installed at:") + " " + m_sel->installedObj()->installtime().form("%x"); + if (!hasUpgrade()) + hasCandidate = false; // only for upgrades + if (hasCandidate) + text += "   "; } + else if (hasCandidate) + text += br; + if (hasCandidate) + text += std::string ("") + _("Last build from:") + " " + m_sel->candidateObj()->buildtime().form("%x"); break; } case Ypp::Package::PATCH_TYPE: -- 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] r52620 - in /trunk/gtk: ChangeLog src/YGPackageSelector.cc src/ygtkfindentry.c src/ygtkfindentry.h src/ygtkwizard.c src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: rpmcruz Date: Tue Oct 28 02:39:26 2008 New Revision: 52620 URL: http://svn.opensuse.org/viewcvs/yast?rev=52620&view=rev Log: * src/ygtkfindentry.h/c: added tooltip argument to insert_item. added set_state() method to highlight the entry for incorrect input, and select_item(). * src/YGPackageSelector.cc: moved recent spin box into a find entry item. Also, only remove find entry when changing the type combo. * src/yzyppwrapper.cc: zypp::RepoManager::knownRepositories() isn't accurate, but it features disabled repositories, so use it for that purpose. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/ygtkfindentry.c trunk/gtk/src/ygtkfindentry.h trunk/gtk/src/ygtkwizard.c trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52620&r1=52619… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Oct 28 02:39:26 2008 @@ -1,3 +1,16 @@ +2008-10-28 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkfindentry.h/c: added tooltip argument to insert_item. + added set_state() method to highlight the entry for incorrect + input, and select_item(). + + * src/YGPackageSelector.cc: moved recent spin box into a find entry + item. Also, only remove find entry when changing the type combo. + + * src/yzyppwrapper.cc: zypp::RepoManager::knownRepositories() isn't + accurate, but it features disabled repositories, so use it for that + purpose. + 2008-10-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc (Categories): ensure Categories item 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 Tue Oct 28 02:39:26 2008 @@ -1100,7 +1100,6 @@ 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) @@ -1114,40 +1113,7 @@ "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); } @@ -1211,11 +1177,6 @@ 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) @@ -1516,16 +1477,18 @@ "will be matched against RPM name and summary attributes. " "Other criteria attributes are available by pressing the search icon.\n" "(usage example: \"yast dhcp\" will return yast's dhcpd tool)")); - g_signal_connect (G_OBJECT (m_name), "changed", - G_CALLBACK (name_changed_cb), this); ygtk_find_entry_insert_item (YGTK_FIND_ENTRY (m_name), _("Filter by name & summary"), - GTK_STOCK_FIND); + GTK_STOCK_FIND, NULL); ygtk_find_entry_insert_item (YGTK_FIND_ENTRY (m_name), _("Filter by description"), - GTK_STOCK_EDIT); + GTK_STOCK_EDIT, NULL); ygtk_find_entry_insert_item (YGTK_FIND_ENTRY (m_name), _("Filter by file"), - GTK_STOCK_OPEN); + GTK_STOCK_OPEN, NULL); ygtk_find_entry_insert_item (YGTK_FIND_ENTRY (m_name), _("Filter by author"), - GTK_STOCK_ABOUT); + GTK_STOCK_ABOUT, NULL); + ygtk_find_entry_insert_item (YGTK_FIND_ENTRY (m_name), _("Filter by novelty (in days)"), + GTK_STOCK_NEW, _("Number of days since the package was built by the repository.")); + g_signal_connect (G_OBJECT (m_name), "changed", + G_CALLBACK (name_changed_cb), this); g_signal_connect (G_OBJECT (m_name), "menu-item-selected", G_CALLBACK (name_item_changed_cb), this); @@ -1561,8 +1524,19 @@ } private: + void clearNameEntry() + { + g_signal_handlers_block_by_func (m_name, (gpointer) name_changed_cb, this); + g_signal_handlers_block_by_func (m_name, (gpointer) name_item_changed_cb, this); + gtk_entry_set_text (GTK_ENTRY (m_name), ""); + ygtk_find_entry_select_item (YGTK_FIND_ENTRY (m_name), 0); + g_signal_handlers_unblock_by_func (m_name, (gpointer) name_changed_cb, this); + g_signal_handlers_unblock_by_func (m_name, (gpointer) name_item_changed_cb, this); + } + static void type_changed_cb (GtkComboBox *combo, Filters *pThis) { + pThis->clearNameEntry(); int type = gtk_combo_box_get_active (combo); if (pThis->m_updateMode && type == 1) type = Collections::REPOS_TYPE; @@ -1571,9 +1545,31 @@ } static void name_changed_cb (YGtkFindEntry *entry, Filters *pThis) - { pThis->m_nameChanged = true; pThis->signalChangedDelay(); } - static void name_item_changed_cb (gpointer widget, gint nb, Filters *pThis) - { pThis->m_nameChanged = true; pThis->signalChangedDelay(); } + { + gint nb = ygtk_find_entry_get_selected_item (entry); + if (nb == 4) { // novelty only allows numbers + const gchar *text = gtk_entry_get_text (GTK_ENTRY (entry)); + gboolean correct = TRUE; + for (const gchar *i = text; *i; i++) + if (!g_ascii_isdigit (*i)) { + correct = FALSE; + break; + } + ygtk_find_entry_set_state (entry, correct); + } + pThis->signalChangedDelay(); + } + static void name_item_changed_cb (YGtkFindEntry *entry, gint nb, Filters *pThis) + { + const gchar *text = ""; + if (nb == 4) text = "7"; // novelty is weird; show usage case + g_signal_handlers_block_by_func (entry, (gpointer) name_changed_cb, pThis); + gtk_entry_set_text (GTK_ENTRY (entry), text); + g_signal_handlers_unblock_by_func (entry, (gpointer) name_changed_cb, pThis); + gtk_editable_set_position (GTK_EDITABLE (entry), -1); + + pThis->signalChanged(); + } static void field_changed_cb (gpointer widget, Filters *pThis) { pThis->signalChangedDelay(); } @@ -1585,15 +1581,6 @@ if (!m_listener) return; busyCursor(); - if (!m_nameChanged && *gtk_entry_get_text (GTK_ENTRY (m_name))) { - g_signal_handlers_block_by_func (m_name, - (gpointer) name_changed_cb, this); - gtk_entry_set_text (GTK_ENTRY (m_name), ""); - g_signal_handlers_unblock_by_func (m_name, - (gpointer) name_changed_cb, this); - } - m_nameChanged = false; - // create query Ypp::QueryPool::Query *query = new Ypp::QueryPool::Query(); if (m_updateMode) @@ -1604,58 +1591,65 @@ const char *name = gtk_entry_get_text (GTK_ENTRY (m_name)); if (*name) { gint item = ygtk_find_entry_get_selected_item (YGTK_FIND_ENTRY (m_name)); - bool use_name, use_summary, use_description, use_filelist, use_authors; - use_name = use_summary = use_description = use_filelist = use_authors = false; - switch (item) { - case 0: // name & summary - default: - use_name = use_summary = true; - break; - case 1: // description - use_name = use_summary = use_description = true; - break; - case 2: // file - use_filelist = true; - break; - case 3: // author - use_authors = true; - break; + if (item == 4) { // novelty + int days = atoi (name); + query->setBuildAge (days); + } + else { + bool use_name, use_summary, use_description, use_filelist, use_authors; + use_name = use_summary = use_description = use_filelist = use_authors = false; + switch (item) { + case 0: // name & summary + default: + use_name = use_summary = true; + break; + case 1: // description + use_name = use_summary = use_description = true; + break; + case 2: // file + use_filelist = true; + break; + case 3: // author + use_authors = true; + break; + } + query->addNames (name, ' ', use_name, use_summary, use_description, + use_filelist, use_authors); } - query->addNames (name, ' ', use_name, use_summary, use_description, - use_filelist, use_authors); - // tip: the user may be searching for patterns - static bool shown_pattern_tip = false; - if (!m_updateMode && !shown_pattern_tip && - gtk_combo_box_get_active (GTK_COMBO_BOX (m_type)) == 0 && - (m_statuses->getActive() == StatusButtons::AVAILABLE || - m_statuses->getActive() == StatusButtons::ALL)) { - Ypp::QueryPool::Query *query = new Ypp::QueryPool::Query(); - query->addType (Ypp::Package::PATTERN_TYPE); - query->addNames (name, ' ', true, false, false, false, false, true); - query->setIsInstalled (false); - Ypp::QueryPool pool (query); - if (!pool.empty()) { - shown_pattern_tip = true; - //std::string first = pool.getName (pool.getFirst()); - std::string text = - _("Patterns are available that can\n" - "assist you in the installment\nof"); - text += " " + std::string (name) + " "; - text += _("related packages."); - GtkWidget *tooltip, *box, *label, *image; - tooltip = ygtk_tooltip_new(); - label = gtk_label_new (text.c_str()); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, - GTK_ICON_SIZE_BUTTON); - box = gtk_hbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (box), image, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); - gtk_widget_show_all (box); - gtk_container_add (GTK_CONTAINER (tooltip), box); - ygtk_tooltip_show_at_widget (YGTK_TOOLTIP (tooltip), m_type, - YGTK_POINTER_UP_LEFT); + if (item == 0) { // tip: the user may be searching for patterns + static bool shown_pattern_tip = false; + if (!m_updateMode && !shown_pattern_tip && + gtk_combo_box_get_active (GTK_COMBO_BOX (m_type)) == 0 && + (m_statuses->getActive() == StatusButtons::AVAILABLE || + m_statuses->getActive() == StatusButtons::ALL)) { + Ypp::QueryPool::Query *query = new Ypp::QueryPool::Query(); + query->addType (Ypp::Package::PATTERN_TYPE); + query->addNames (name, ' ', true, false, false, false, false, true); + query->setIsInstalled (false); + Ypp::QueryPool pool (query); + if (!pool.empty()) { + shown_pattern_tip = true; + //std::string first = pool.getName (pool.getFirst()); + std::string text = + _("Patterns are available that can\n" + "assist you in the installment\nof"); + text += " " + std::string (name) + " "; + text += _("related packages."); + GtkWidget *tooltip, *box, *label, *image; + tooltip = ygtk_tooltip_new(); + label = gtk_label_new (text.c_str()); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, + GTK_ICON_SIZE_BUTTON); + box = gtk_hbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (box), image, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); + gtk_widget_show_all (box); + gtk_container_add (GTK_CONTAINER (tooltip), box); + ygtk_tooltip_show_at_widget (YGTK_TOOLTIP (tooltip), m_type, + YGTK_POINTER_UP_LEFT); + } } } } Modified: trunk/gtk/src/ygtkfindentry.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkfindentry.c?rev=5262… ============================================================================== --- trunk/gtk/src/ygtkfindentry.c (original) +++ trunk/gtk/src/ygtkfindentry.c Tue Oct 28 02:39:26 2008 @@ -570,18 +570,20 @@ GtkWidget *menu = gtk_widget_get_parent (GTK_WIDGET (item)); GList *items = gtk_container_get_children (GTK_CONTAINER (menu)); entry->selected_item = g_list_index (items, item); - g_signal_emit (entry, menu_item_selected_signal, 0, entry->selected_item); g_list_free (items); generate_find_icon (entry); + g_signal_emit (entry, menu_item_selected_signal, 0, entry->selected_item); } -guint ygtk_find_entry_insert_item (YGtkFindEntry *entry, const char *text, const char *stock) +guint ygtk_find_entry_insert_item (YGtkFindEntry *entry, const char *text, const char *stock, const char *tooltip) { if (!entry->context_menu) ygtk_find_entry_attach_menu (entry, GTK_MENU (gtk_menu_new())); GtkWidget *item = gtk_image_menu_item_new_with_label (text); GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); + if (tooltip) + gtk_widget_set_tooltip_text (item, tooltip); gtk_menu_shell_append (GTK_MENU_SHELL (entry->context_menu), item); gtk_widget_show_all (GTK_WIDGET (entry->context_menu)); g_signal_connect (G_OBJECT (item), "activate", @@ -597,6 +599,31 @@ return entry->selected_item; } +void ygtk_find_entry_select_item (YGtkFindEntry *entry, gint item) +{ + if (entry->selected_item != item) { + entry->selected_item = item; + generate_find_icon (entry); + g_signal_emit (entry, menu_item_selected_signal, 0, entry->selected_item); + } +} + +void ygtk_find_entry_set_state (YGtkFindEntry *entry, gboolean correct) +{ + GtkWidget *widget = GTK_WIDGET (entry); + if (correct) { // revert + gtk_widget_modify_base (widget, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_text (widget, GTK_STATE_NORMAL, NULL); + } + else { + GdkColor red = { 0, 255 << 8, 102 << 8, 102 << 8 }, + white = { 0, 255 << 8, 255 << 8, 255 << 8 }; + gtk_widget_modify_base (widget, GTK_STATE_NORMAL, &red); + gtk_widget_modify_text (widget, GTK_STATE_NORMAL, &white); + gtk_widget_error_bell (widget); + } +} + GtkWidget *ygtk_find_entry_new (void /*gboolean will_use_find_icon */) { return g_object_new (YGTK_TYPE_FIND_ENTRY, NULL); Modified: trunk/gtk/src/ygtkfindentry.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkfindentry.h?rev=5262… ============================================================================== --- trunk/gtk/src/ygtkfindentry.h (original) +++ trunk/gtk/src/ygtkfindentry.h Tue Oct 28 02:39:26 2008 @@ -103,8 +103,12 @@ void ygtk_find_entry_attach_menu (YGtkFindEntry *entry, GtkMenu *popup_menu); // add an internal menu -guint ygtk_find_entry_insert_item (YGtkFindEntry *entry, const char *text, const char *stock); +guint ygtk_find_entry_insert_item (YGtkFindEntry *entry, const char *text, + const char *stock, const char *tooltip); gint ygtk_find_entry_get_selected_item (YGtkFindEntry *entry); +void ygtk_find_entry_select_item (YGtkFindEntry *entry, gint item); + +void ygtk_find_entry_set_state (YGtkFindEntry *entry, gboolean correct); G_END_DECLS #endif /*YGTK_FIND_ENTRY_H*/ Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=52620&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Tue Oct 28 02:39:26 2008 @@ -45,17 +45,8 @@ static void search_entry_modified_cb (GtkEditable *editable, YGtkHelpDialog *dialog) { gchar *key = gtk_editable_get_chars (editable, 0, -1); - if (!ygtk_html_wrap_search (dialog->help_text, key)) { - GdkColor red = { 0, 255 << 8, 102 << 8, 102 << 8 }, - white = { 0, 255 << 8, 255 << 8, 255 << 8 }; - gtk_widget_modify_base (dialog->search_entry, GTK_STATE_NORMAL, &red); - gtk_widget_modify_text (dialog->search_entry, GTK_STATE_NORMAL, &white); - gtk_widget_error_bell (GTK_WIDGET (dialog)); - } - else { - gtk_widget_modify_base (dialog->search_entry, GTK_STATE_NORMAL, NULL); - gtk_widget_modify_text (dialog->search_entry, GTK_STATE_NORMAL, NULL); - } + gboolean found = ygtk_html_wrap_search (dialog->help_text, key); + ygtk_find_entry_set_state (YGTK_FIND_ENTRY (dialog->search_entry), found); g_free (key); } static void search_entry_activated_cb (GtkEntry *entry, YGtkHelpDialog *dialog) Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5262… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Tue Oct 28 02:39:26 2008 @@ -2022,19 +2022,35 @@ const Ypp::Repository *Ypp::Impl::getRepository (int nb) { if (!repos) { + struct inner { + static void addRepo (Ypp::Impl *impl, const zypp::RepoInfo &info) + { + Repository *repo = new Repository(); + repo->name = info.name(); + if (!info.baseUrlsEmpty()) + repo->url = info.baseUrlsBegin()->asString(); + repo->alias = info.alias(); + repo->enabled = info.enabled(); + impl->repos = g_slist_append (impl->repos, repo); + } + }; for (zypp::ResPoolProxy::repository_iterator it = zyppPool().knownRepositoriesBegin(); it != zyppPool().knownRepositoriesEnd(); it++) { const zypp::Repository &zrepo = *it; if (zrepo.isSystemRepo()) continue; - const zypp::RepoInfo info = zrepo.info(); - Repository *repo = new Repository(); - repo->name = info.name(); - if (!info.baseUrlsEmpty()) - repo->url = info.baseUrlsBegin()->asString(); - repo->alias = info.alias(); - repo->enabled = info.enabled(); - repos = g_slist_append (repos, repo); + inner::addRepo (this, zrepo.info()); + } + // zyppPool::knownRepositories is more accurate, but it doesn't feature disabled + // repositories. Add them with the following API. + zypp::RepoManager manager; + std::list <zypp::RepoInfo> known_repos = manager.knownRepositories(); + for (std::list <zypp::RepoInfo>::const_iterator it = known_repos.begin(); + it != known_repos.end(); it++) { + const zypp::RepoInfo info = *it; + if (info.enabled()) + continue; + inner::addRepo (this, info); } } return (Repository *) g_slist_nth_data (repos, nb); -- 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] r52619 - /tags/stable-2_17_3/wagon/
by locilka＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: locilka Date: Mon Oct 27 17:18:09 2008 New Revision: 52619 URL: http://svn.opensuse.org/viewcvs/yast?rev=52619&view=rev Log: Created tag stable-2_17_3 for wagon Added: tags/stable-2_17_3/wagon/ - copied from r52618, trunk/wagon/ -- 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] r52618 - in /trunk/wagon: VERSION package/yast2-wagon.changes
by locilka＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: locilka Date: Mon Oct 27 17:18:01 2008 New Revision: 52618 URL: http://svn.opensuse.org/viewcvs/yast?rev=52618&view=rev Log: version Modified: trunk/wagon/VERSION trunk/wagon/package/yast2-wagon.changes Modified: trunk/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/VERSION?rev=52618&r1=52617… ============================================================================== --- trunk/wagon/VERSION (original) +++ trunk/wagon/VERSION Mon Oct 27 17:18:01 2008 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Mon Oct 27 17:18:01 2008 @@ -2,6 +2,7 @@ Mon Oct 27 12:52:02 CET 2008 - locilka(a)suse.cz - Calling inst_prepareprogress before inst_kickoff (bnc #438848). +- 2.17.3 ------------------------------------------------------------------- Wed Oct 22 19:15:47 CEST 2008 - locilka(a)suse.cz -- 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] r52617 - /tags/stable-2_17_41/yast2/
by locilka＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: locilka Date: Mon Oct 27 17:15:22 2008 New Revision: 52617 URL: http://svn.opensuse.org/viewcvs/yast?rev=52617&view=rev Log: Created tag stable-2_17_41 for yast2 Added: tags/stable-2_17_41/yast2/ - copied from r52616, trunk/yast2/ -- 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] r52616 - /tags/stable-2_17_41/
by locilka＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: locilka Date: Mon Oct 27 17:15:21 2008 New Revision: 52616 URL: http://svn.opensuse.org/viewcvs/yast?rev=52616&view=rev Log: Created tag stable-2_17_41 Added: tags/stable-2_17_41/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0