February 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60909 - in /trunk/gtk: Makefile.cvs VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 21 Feb '10

21 Feb '10

Author: rpmcruz Date: Sun Feb 21 02:50:20 2010 New Revision: 60909 URL: http://svn.opensuse.org/viewcvs/yast?rev=60909&view=rev Log: Milestone version. Modified: trunk/gtk/Makefile.cvs trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/Makefile.cvs?rev=60909&r1=60… ============================================================================== --- trunk/gtk/Makefile.cvs (original) +++ trunk/gtk/Makefile.cvs Sun Feb 21 02:50:20 2010 @@ -9,7 +9,7 @@ configure: mkdir build ;\ cd build ;\ - cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DLIB=$(LIB) .. && make + cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DLIB=$(LIB) .. && VERBOSE=1 make # use "VERBOSE=1 make" to read full gcc argument Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=60909&r1=60908&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Sun Feb 21 02:50:20 2010 @@ -1 +1 @@ -2.21.6 +2.21.7 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=60909&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Sun Feb 21 02:50:20 2010 @@ -1,4 +1,4 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "6") +SET(VERSION_PATCH "7") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Sun Feb 21 02:50:20 2010 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Fri Feb 19 19:00:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt +Fri Feb 21 19:00:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt -- 2.21.1 - 2.21.6 +- 2.21.1 - 2.21.7 - build attempts. ------------------------------------------------------------------- -- 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] r60908 - in /trunk/gtk: ChangeLog src/CMakeLists.txt src/pkg/CMakeLists.txt src/pkg/YGPackageSelector.cc src/pkg/pkg-selector-help.h src/pkg/ygtkpkgdetailview.cc src/pkg/ygtkpkgstatusbar.cc
by rpmcruz＠svn.opensuse.org 21 Feb '10

21 Feb '10

Author: rpmcruz Date: Sun Feb 21 02:49:34 2010 New Revision: 60908 URL: http://svn.opensuse.org/viewcvs/yast?rev=60908&view=rev Log: * src/pkg/ygtkpkgdetailview.cc: added (void) before system() call to quiet warning. * src/CMakeLists.txt: added py2gtk dependency to test target. * src/pkg/CMakeLists.txt: added py2gtk dependency to py2gtk_pkg target. * src/pkg/ygtkpkgstatusbar.cc: small UI polish. * src/pkg/pkg-selector-help.h: Atri Bhattacharya spotted a couple of typos. Modified: trunk/gtk/ChangeLog trunk/gtk/src/CMakeLists.txt trunk/gtk/src/pkg/CMakeLists.txt trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/pkg-selector-help.h trunk/gtk/src/pkg/ygtkpkgdetailview.cc trunk/gtk/src/pkg/ygtkpkgstatusbar.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60908&r1=60907… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sun Feb 21 02:49:34 2010 @@ -1,3 +1,19 @@ +2010-02-21 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/ygtkpkgdetailview.cc: added (void) before + system() call to quiet warning. + + * src/CMakeLists.txt: added py2gtk dependency to test + target. + + * src/pkg/CMakeLists.txt: added py2gtk dependency to + py2gtk_pkg target. + + * src/pkg/ygtkpkgstatusbar.cc: small UI polish. + + * src/pkg/pkg-selector-help.h: Atri Bhattacharya + spotted a couple of typos. + 2010-02-20 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/pkg-selector-help.h: updated help text. Modified: trunk/gtk/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/CMakeLists.txt?rev=60908… ============================================================================== --- trunk/gtk/src/CMakeLists.txt (original) +++ trunk/gtk/src/CMakeLists.txt Sun Feb 21 02:49:34 2010 @@ -69,6 +69,7 @@ link_directories (${CMAKE_BINARY_DIR}/src) add_executable (test test.cc) +add_dependencies (test py2gtk) target_link_libraries (test libpy2gtk.so) target_link_libraries (test ${GTK2_LIBRARIES}) target_link_libraries (test ${LIBYUI_LIBRARY}) Modified: trunk/gtk/src/pkg/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/CMakeLists.txt?rev=6… ============================================================================== --- trunk/gtk/src/pkg/CMakeLists.txt (original) +++ trunk/gtk/src/pkg/CMakeLists.txt Sun Feb 21 02:49:34 2010 @@ -34,10 +34,11 @@ ## target: add_library (py2gtk_pkg SHARED ${gtk_pkg_yast_plugin_SRCS}) +add_dependencies (py2gtk_pkg py2gtk) ## libraries: -target_link_libraries (py2gtk_pkg libpy2gtk.so.2) +target_link_libraries (py2gtk_pkg libpy2gtk.so) target_link_libraries (py2gtk_pkg ${GTK2_LIBRARIES}) target_link_libraries (py2gtk_pkg ${LIBYUI_LIBRARY}) target_link_libraries (py2gtk_pkg ${ZYPP_LIBRARY}) Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Sun Feb 21 02:49:34 2010 @@ -488,7 +488,7 @@ virtual YGtkPkgQueryWidget *createQueryWidget (YGtkPkgQueryCombo *combo, int index) { Ypp::Busy busy (0); - YGtkPkgFilterModel *model; + YGtkPkgFilterModel *model = 0; if (YGPackageSelector::get()->onlineUpdateMode()) { switch (index) { case 0: model = new YGtkPkgPriorityModel(); break; Modified: trunk/gtk/src/pkg/pkg-selector-help.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/pkg-selector-help.h?… ============================================================================== --- trunk/gtk/src/pkg/pkg-selector-help.h (original) +++ trunk/gtk/src/pkg/pkg-selector-help.h Sun Feb 21 02:49:34 2010 @@ -11,16 +11,16 @@ "if needed. The user need not be concerned about such underlying dependencies. " "Likewise, the plugins and other non-essential data of a given application may " "be shipped in their own packages, so the user may install them only if needed."), - _("Common suffices for complementory packages:" + _("Common suffixes for complementory packages:" "<ul>" "<li>-plugin-: extends the application with extra functionality.</li>" "<li>-devel: headers for software development.</li>" - "<li>-debuginfo: debug symbols for for software testing.</li>" + "<li>-debuginfo: debug symbols for software testing.</li>" "<li>-fr, -pl or other language siglas: translation files (your language " "will be marked for installation automatically when needed).</li>" "</ul>"), _("Both the packages that are installed on your system, and the packages " - "that are available by the repositories you have configured will be listed " + "that are available from the repositories you have configured will be listed " "together. Status filters are available in the right-bottom box."), _("<blockquote>A repository is a packages media; it can either be local (such as the " "installation CD), or a remote internet server. You can find an utility to setup " Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Sun Feb 21 02:49:34 2010 @@ -209,7 +209,7 @@ command += link; } command += " &"; - system (command.c_str()); + (void) system (command.c_str()); } static void copy_link_cb (GtkMenuItem *item, DetailDescription *pThis) @@ -835,7 +835,7 @@ static void dirname_pressed_cb (GtkWidget *text, const gchar *link, FilelistExpander *pThis) { gchar *cmd = g_strdup_printf (GNOME_OPEN_BIN " %s &", link); - system (cmd); + (void) system (cmd); g_free (cmd); } Modified: trunk/gtk/src/pkg/ygtkpkgstatusbar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgstatusbar.cc?… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgstatusbar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgstatusbar.cc Sun Feb 21 02:49:34 2010 @@ -16,15 +16,10 @@ #include "yzyppwrapper.h" #include <gtk/gtk.h> -static void small_button_style_set_cb (GtkWidget *button, GtkStyle *prev_style) -{ // based on gedit - int width, height; - gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), - GTK_ICON_SIZE_MENU, &width, &height); - gtk_widget_set_size_request (button, width+2, height+2); -} +static void small_size_request_cb (GtkWidget *widget, GtkRequisition *req) +{ req->width += 4; } -static void setup_small_widget_style() +static void set_small_widget (GtkWidget *widget) { static bool first_time = true; if (first_time) { @@ -39,22 +34,10 @@ "}\n" "widget \"*.small-widget\" style \"small-widget-style\""); } -} -static GtkWidget *create_small_button (const char *stock_icon, const char *tooltip) -{ - setup_small_widget_style(); - - GtkWidget *button = gtk_button_new(); - gtk_widget_set_name (button, "small-widget"); - gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); - gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); - gtk_widget_set_tooltip_text (button, tooltip); - GtkWidget *image = gtk_image_new_from_stock (stock_icon, GTK_ICON_SIZE_MENU); - gtk_button_set_image (GTK_BUTTON (button), image); - g_signal_connect (G_OBJECT (button), "style-set", - G_CALLBACK (small_button_style_set_cb), NULL); - return button; + gtk_widget_set_name (widget, "small-widget"); + g_signal_connect (G_OBJECT (widget), "size-request", + G_CALLBACK (small_size_request_cb), NULL); } struct LastChange { @@ -64,16 +47,16 @@ LastChange() { -#if 0 icon = gtk_image_new(); gtk_widget_set_size_request (icon, 16, 16); -#endif + text = gtk_label_new (""); gtk_misc_set_alignment (GTK_MISC (text), 0, .5); - undo_button = create_small_button (GTK_STOCK_UNDO, _("Undo")); + undo_button = gtk_button_new_from_stock (GTK_STOCK_UNDO); + set_small_widget (undo_button); g_signal_connect (G_OBJECT (undo_button), "clicked", G_CALLBACK (undo_clicked_cb), this); - gchar *str = g_strdup_printf ("(<a href=\"more\">%s</a>)", _("more")); + gchar *str = g_strdup_printf ("(<a href=\"more\">%s</a>)", _("see all changes")); GtkWidget *more = gtk_label_new (str); g_free (str); gtk_label_set_use_markup (GTK_LABEL (more), TRUE); @@ -82,9 +65,7 @@ G_CALLBACK (more_link_cb), this); hbox = gtk_hbox_new (FALSE, 6); -#if 0 gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, TRUE, 0); -#endif gtk_box_pack_start (GTK_BOX (hbox), text, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), undo_button, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), more, FALSE, TRUE, 0); @@ -95,15 +76,13 @@ int auto_count; Ypp::Selectable *sel = list->front (&auto_count); if (sel) { -#if 0 const char *stock = getStatusStockIcon (*sel); GdkPixbuf *pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(), stock, 16, GtkIconLookupFlags (0), NULL); //GdkPixbuf *_pixbuf = YGUtils::setGray (pixbuf); gtk_image_set_from_pixbuf (GTK_IMAGE (icon), pixbuf); g_object_unref (G_OBJECT (pixbuf)); -#endif - +#if 1 const char *action; if (sel->toInstall()) { action = _("install"); @@ -132,14 +111,23 @@ else format = "%s %s"; gchar *str = g_strdup_printf (format, action, sel->name().c_str(), auto_count); +#else + const char *format; + if (auto_count > 1) + format = _("%s, plus %d dependencies"); + else if (auto_count == 1) + format = _("%s, plus 1 dependency"); + else + format = "%s"; + gchar *str = g_strdup_printf (format, sel->name().c_str(), auto_count); +#endif + gtk_label_set_markup (GTK_LABEL (text), str); gtk_widget_set_sensitive (undo_button, TRUE); g_free (str); } else { -#if 0 gtk_image_clear (GTK_IMAGE (icon)); -#endif gtk_label_set_markup (GTK_LABEL (text), _("No changes to perform")); gtk_widget_set_sensitive (undo_button, FALSE); } @@ -238,7 +226,7 @@ combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store)); g_object_unref (G_OBJECT (store)); - setup_small_widget_style(); + set_small_widget (combo); gtk_widget_set_name (combo, "small-widget"); gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (combo), FALSE); GtkCellRenderer *renderer = gtk_cell_renderer_text_new(); -- 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] r60907 - /tags/stable-2_21_6/gtk/
by rpmcruz＠svn.opensuse.org 20 Feb '10

20 Feb '10

Author: rpmcruz Date: Sat Feb 20 16:49:49 2010 New Revision: 60907 URL: http://svn.opensuse.org/viewcvs/yast?rev=60907&view=rev Log: Created tag stable-2_21_6 for gtk Added: tags/stable-2_21_6/gtk/ - copied from r60906, trunk/gtk/ -- 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] r60906 - /tags/stable-2_21_6/
by rpmcruz＠svn.opensuse.org 20 Feb '10

20 Feb '10

Author: rpmcruz Date: Sat Feb 20 16:49:43 2010 New Revision: 60906 URL: http://svn.opensuse.org/viewcvs/yast?rev=60906&view=rev Log: Created tag stable-2_21_6 Added: tags/stable-2_21_6/ -- 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] r60905 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes src/pkg/CMakeLists.txt
by rpmcruz＠svn.opensuse.org 20 Feb '10

20 Feb '10

Author: rpmcruz Date: Sat Feb 20 16:49:35 2010 New Revision: 60905 URL: http://svn.opensuse.org/viewcvs/yast?rev=60905&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/pkg/CMakeLists.txt Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=60905&r1=60904&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Sat Feb 20 16:49:35 2010 @@ -1 +1 @@ -2.21.5 +2.21.6 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=60905&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Sat Feb 20 16:49:35 2010 @@ -1,4 +1,4 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "5") +SET(VERSION_PATCH "6") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Sat Feb 20 16:49:35 2010 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Feb 19 19:00:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt -- 2.21.1 - 2.21.5 +- 2.21.1 - 2.21.6 - build attempts. ------------------------------------------------------------------- Modified: trunk/gtk/src/pkg/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/CMakeLists.txt?rev=6… ============================================================================== --- trunk/gtk/src/pkg/CMakeLists.txt (original) +++ trunk/gtk/src/pkg/CMakeLists.txt Sat Feb 20 16:49:35 2010 @@ -37,7 +37,7 @@ ## libraries: -target_link_libraries (py2gtk_pkg libpy2gtk.so) +target_link_libraries (py2gtk_pkg libpy2gtk.so.2) target_link_libraries (py2gtk_pkg ${GTK2_LIBRARIES}) target_link_libraries (py2gtk_pkg ${LIBYUI_LIBRARY}) target_link_libraries (py2gtk_pkg ${ZYPP_LIBRARY}) -- 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] r60904 - in /trunk/gtk: ChangeLog src/pkg/pkg-selector-help.h
by rpmcruz＠svn.opensuse.org 20 Feb '10

20 Feb '10

Author: rpmcruz Date: Sat Feb 20 16:24:26 2010 New Revision: 60904 URL: http://svn.opensuse.org/viewcvs/yast?rev=60904&view=rev Log: * src/pkg/pkg-selector-help.h: updated help text. Modified: trunk/gtk/ChangeLog trunk/gtk/src/pkg/pkg-selector-help.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60904&r1=60903… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Feb 20 16:24:26 2010 @@ -1,3 +1,7 @@ +2010-02-20 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/pkg-selector-help.h: updated help text. + 2010-02-19 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGMenuButton.cc: bug fix: YContextMenu wasn't Modified: trunk/gtk/src/pkg/pkg-selector-help.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/pkg-selector-help.h?… ============================================================================== --- trunk/gtk/src/pkg/pkg-selector-help.h (original) +++ trunk/gtk/src/pkg/pkg-selector-help.h Sat Feb 20 16:24:26 2010 @@ -5,68 +5,73 @@ static const char *pkg_help[] = { _("<h1>Purpose</h1>" "This tool lets you install, remove, and update applications." - "&product; 's software management is also called 'package management'. A package is " - "generally an application bundle, but multiple packages that extend the application " - "may be offered in order to avoid clutter (e.g. games tend to de-couple the music " - "data in another package, since its not essential and requires significant disk space). " - "The base package will get the application's name, while extra packages are suffix-ed. " - "Common extras are:" + "Software in &product; is broken down and distributed in the form of " + "packages. This way, if multiple applications require a common system file, " + "this system file is shipped in its own package and is installed only once " + "if needed. The user need not be concerned about such underlying dependencies. " + "Likewise, the plugins and other non-essential data of a given application may " + "be shipped in their own packages, so the user may install them only if needed."), + _("Common suffices for complementory packages:" "<ul>" - "<li>-plugin-: extends the application with some extra functionality.</li>" - "<li>-devel: needed for software development.</li>" - "<li>-debuginfo: needed for software beta-testing.</li>" - "<li>-fr, -dr, -pl (language siglas): translation files (your language package will " - "be marked for installation automatically).</li>" + "<li>-plugin-: extends the application with extra functionality.</li>" + "<li>-devel: headers for software development.</li>" + "<li>-debuginfo: debug symbols for for software testing.</li>" + "<li>-fr, -pl or other language siglas: translation files (your language " + "will be marked for installation automatically when needed).</li>" "</ul>"), - _("You will find both packages installed on your system, and packages that are made " - "available through the configured repositories." - "<blockquote>A repository is a packages media; it can either be local (such as the " - "&product; CDs), or a remote internet server. You can find utilities to setup " - "repositories on the YaST control center.</blockquote>"), - _("<h1>Usage</h1>" - "<h2>Install, Upgrade, Remove, Undo tab pages</h2>" - "These tabs produce listings of the different sources of packages. 'Install' " - "lists available packages from the configured repositories. " - "'Upgrade' are the subset of installed packages that have more recent versions " - "available. 'Remove' allows you to uninstall a package that is installed in your " - "system. You can review changes in the 'Undo' tab, and revoke changes individually " - "at any time." - "Press the 'Apply' button when you want your changes to be performed."), - _("<h2>Search</h2>" + _("Both the packages that are installed on your system, and the packages " + "that are available by the repositories you have configured will be listed " + "together. Status filters are available in the right-bottom box."), + _("<blockquote>A repository is a packages media; it can either be local (such as the " + "installation CD), or a remote internet server. You can find an utility to setup " + "repositories on the YaST control center, which can also be accessed via the " + "Configuration > Repositories menu item.</blockquote>"), + _("<h1>Usage</h1>"), + _("<h2>Install, Upgrade, Remove, Undo tab pages</h2>" + "All packages are listed together unless you have selected a status filter " + "from the right-bottom box. The check-box next to the package name indicates whether " + "the package is installed or not. If a more recent version of an installed " + "package is available, the version text will be highlighted in blue and an " + "upgrade button conveniently placed next to it. It is highlighted red if the " + "version installed is no longer being made available in any configured repository." + "The context menu (right click on a package) provides extra options. " + "The Undo option can be used to revert any changes you have made. Multiple " + "packages may be selected (using the Control key) and modified together." + "Use the Version list over the description box to select a specific version " + "of a package." + "Press the Apply button when you want your changes to be performed."), + _("<h2>Lock software</h2>" + "Packages can be locked against automatic changes via the context menu." + "Locking is only useful in very unusual cases: for instance, you may not want " + "to install a given driver because it interferes with your system, yet you want " + "to install some collection that includes it. Locks can be applied whether the " + "package is installed or not."), + _("<h2>Filters</h2>"), + _("<h3>Search</h3>" "Enter free text into the search-field to match their names and descriptions. " "(a search for 'office' will bring up the 'OpenOffice' packages as well as " - "AbiWord which carries the word 'office' in its description). You can also " - "choose to view software from a specific repository. Searching other attributes " - "is possible. For instance, you may perform a search on the installed package " - "containing a given file. Press the search icon for the filter menu."), - _("<h2>Groups, Patterns, Languages</h2>" + "'AbiWord' which carries the word 'office' in its description). You can search for " + "multiple keywords by separating the with a white space (e.g. 'spread sheet' " + "would return 'OpenOffice-calc').You may use the " + "search combined with a filter, like searching for a package in a given repository. " + "Other search attributes are provided, such as to search for a given file."), + _("<h3>Groups</h3>" "Software for &product; is indexed so that you can find software for a specific " - "task when you don't know the name of the software you are looking for. Browse " - "indexes of software through the Groups pane. A more detailed, hierarchical classification " - "of software packages, like 'Multimedia/Video' is available through the 'Detailed' check " - "button. 'Patterns' and 'Languages' are task-oriented collections of multiple packages that " - "install like one (the installation of the 'server'-pattern for example will install various " - "software needed for running a server). By using 'Install All' you make sure that future " - "collection changes, when you upgrade &product;, will be honored."), + "task when you are not aware of the software selection available. A more detailed, " + "hierarchical classification is provided by the RPM Groups filter."), + _("<h3>Patterns and Languages</h3>" + "Patterns are task-oriented collections of multiple packages that " + "install like one. The installation of the File Server pattern, for example, " + "will install various packages needed for running such a server." + "If you want to install a particular language, you may want to do so via the " + "Language tool from the YaST control center."), _("<h2>Software details in the box below</h2>" "Explore the available information about the package in the box below. Note " - "that more information is available for installed software than that only " + "that more information is available for installed packages than for those only " "available from a repository." "You can also pick a specific version of the package to install from this " - "box." - "The box will be placed to the right on large wide-screens when on fullscreen, " - "in order to better use the screen space."), - _("<h2>Lock software</h2>" - "Advanced users may want to know that locking or unlocking a package against " - "automatic changes can be perfomed by right-clicking the package list entry." - "Locking is only useful in very unusual cases: for instance, you may not want " - "to install a given drivers because it interferes with your system, yet you want " - "to install some collection that includes it."), - _("<h2>Apply button</h2>" - "Changes will be performed once you decide to click the 'Apply' " - "button in the lower-right corner. If you want to leave the software manager " - "without performing any changes, simply press 'Cancel'."), - "http://en.opensuse.org/YaST2-GTK", + "box."), + "<hr/>http://en.opensuse.org/YaST2-GTK", 0 }; @@ -78,17 +83,18 @@ "<h2>Categories</h2>" "Patches are grouped as follows:" "<ul>" - "<li>Security: patches a software flaw that could be exploited to gain " + "<li>Security: patches a software flaw that could be exploited to gain " "restricted privilege.</li>" - "<li>Recommended: fixes non-security related flaws (e.g. data corruption, " + "<li>Recommended: fixes non-security related flaws (e.g. data corruption, " "performance slowdown)</li>" - "<li>Optional: ones that only apply to few users.</li>" + "<li>Optional: ones that only apply to few users.</li>" + "<li>Documentation: fixes documentation errors.</li>" + "<li>YaST: patches for the YaST control center tools.</li>" "</ul>"), - _("Only patches that apply to your system will be visible. &product; developers " - "are very restrained in pushing patches; you can be sure that all patches are " - "of signficant severity." - "If you are looking for applications enhancements, you should check for upgrades " - "on the Software Manager."), + _("Only patches that apply to your system will be visible. You can be sure " + "that the decision to make a patch available is not done trivially." + "If you are looking for applications enhancements, you should check for upgrades " + "on the Software Manager."), 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] r60903 - /trunk/gtk/src/YGMenuButton.cc
by rpmcruz＠svn.opensuse.org 20 Feb '10

20 Feb '10

Author: rpmcruz Date: Sat Feb 20 01:13:32 2010 New Revision: 60903 URL: http://svn.opensuse.org/viewcvs/yast?rev=60903&view=rev Log: YGApplication::openContextMenu() was not free-ing itswidget. Modified: trunk/gtk/src/YGMenuButton.cc Modified: trunk/gtk/src/YGMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGMenuButton.cc?rev=6090… ============================================================================== --- trunk/gtk/src/YGMenuButton.cc (original) +++ trunk/gtk/src/YGMenuButton.cc Sat Feb 20 01:13:32 2010 @@ -112,18 +112,20 @@ } // callbacks + static void deactivate_cb (GtkMenuShell *menu, YGContextMenu *pThis) + { // ugly: we need to make sure a selection was made before this callback called + g_idle_add_full (G_PRIORITY_LOW, cancel_cb, pThis, NULL); + } + static gboolean cancel_cb (gpointer data) { - if (!g_object_get_data (G_OBJECT (data), "active")) + YGContextMenu *pThis = (YGContextMenu *) data; + if (!g_object_get_data (G_OBJECT (pThis->getWidget()), "active")) YGUI::ui()->sendEvent (new YCancelEvent()); + delete pThis; return FALSE; } - static void deactivate_cb (GtkMenuShell *menu, YGContextMenu *pThis) - { // ugly: we need to make sure a selection was made before this callback called - g_idle_add_full (G_PRIORITY_LOW, cancel_cb, menu, NULL); - } - YGWIDGET_IMPL_COMMON (YContextMenu) }; -- 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] r60902 - in /trunk/gtk: ChangeLog src/YGFrame.cc src/YGMenuButton.cc src/YGTable.cc src/YGUtils.cc src/ygtkbargraph.c
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Sat Feb 20 00:45:03 2010 New Revision: 60902 URL: http://svn.opensuse.org/viewcvs/yast?rev=60902&view=rev Log: * src/YGMenuButton.cc: bug fix: YContextMenu wasn't emiting signal when canceled. Also, added stock icons. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGFrame.cc trunk/gtk/src/YGMenuButton.cc trunk/gtk/src/YGTable.cc trunk/gtk/src/YGUtils.cc trunk/gtk/src/ygtkbargraph.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60902&r1=60901… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Feb 20 00:45:03 2010 @@ -1,5 +1,10 @@ 2010-02-19 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + * src/YGMenuButton.cc: bug fix: YContextMenu wasn't + emiting signal when canceled. Also, added stock icons. + +2010-02-19 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + * src/pkg/ygtkpkgstatusbar.cc: got rid of "To install:" and other statistical info. Modified: trunk/gtk/src/YGFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGFrame.cc?rev=60902&r1=… ============================================================================== --- trunk/gtk/src/YGFrame.cc (original) +++ trunk/gtk/src/YGFrame.cc Sat Feb 20 00:45:03 2010 @@ -10,7 +10,7 @@ // Instead of traditional looking frames, we use Gnome convention for the // frame's look. That is: don't draw a frame, use bold header and pad the child. -#define CHILD_INDENTATION 12 +#define CHILD_INDENTATION 8 class YGBaseFrame : public YGWidget { @@ -21,7 +21,7 @@ public: YGBaseFrame (YWidget *ywidget, YWidget *parent) : YGWidget (ywidget, parent, - GTK_TYPE_FRAME, /*"shadow-type", GTK_SHADOW_NONE, */NULL) + GTK_TYPE_FRAME, "shadow-type", GTK_SHADOW_NONE, NULL) { m_containee = gtk_alignment_new (0, 0, 1, 1); gtk_alignment_set_padding (GTK_ALIGNMENT (m_containee), Modified: trunk/gtk/src/YGMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGMenuButton.cc?rev=6090… ============================================================================== --- trunk/gtk/src/YGMenuButton.cc (original) +++ trunk/gtk/src/YGMenuButton.cc Sat Feb 20 00:45:03 2010 @@ -12,6 +12,10 @@ static void selected_item_cb (GtkMenuItem *menuitem, YItem *item) { + // HACK: gtk_menu_get_active() doesn't work properly + GtkWidget *menu = gtk_widget_get_ancestor (GTK_WIDGET (menuitem), GTK_TYPE_MENU); + g_object_set_data (G_OBJECT (menu), "active", menuitem); + YGUI::ui()->sendEvent (new YMenuEvent (item)); } @@ -28,6 +32,11 @@ g_object_unref (G_OBJECT (pixbuf)); } } + else { + const char *stock = YGUtils::mapStockIcon (str); + if (stock) + image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU); + } if (image) { entry = gtk_image_menu_item_new_with_mnemonic (str.c_str()); @@ -89,7 +98,8 @@ : YContextMenu(), YGWidget (this, NULL, GTK_TYPE_MENU, NULL) { - connect (getWidget(), "cancel", G_CALLBACK (cancel_cb), this); + // "cancel" signal doesnt seem to work properly + connect (getWidget(), "deactivate", G_CALLBACK (deactivate_cb), this); } // YContextMenu @@ -102,8 +112,17 @@ } // callbacks - static void cancel_cb (GtkMenuShell *menu, YGContextMenu *pThis) - { YGUI::ui()->sendEvent (new YCancelEvent()); } + static gboolean cancel_cb (gpointer data) + { + if (!g_object_get_data (G_OBJECT (data), "active")) + YGUI::ui()->sendEvent (new YCancelEvent()); + return FALSE; + } + + static void deactivate_cb (GtkMenuShell *menu, YGContextMenu *pThis) + { // ugly: we need to make sure a selection was made before this callback called + g_idle_add_full (G_PRIORITY_LOW, cancel_cb, menu, NULL); + } YGWIDGET_IMPL_COMMON (YContextMenu) }; Modified: trunk/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=60902&r1=… ============================================================================== --- trunk/gtk/src/YGTable.cc (original) +++ trunk/gtk/src/YGTable.cc Sat Feb 20 00:45:03 2010 @@ -227,9 +227,7 @@ #if YAST2_VERSION > 2018003 static void right_click_cb (YGtkTreeView *view, gboolean outreach, YGTableView *pThis) - { - pThis->emitEvent (YEvent::ContextMenuActivated); - } + { pThis->emitEvent (YEvent::ContextMenuActivated); } #endif }; Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=60902&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Sat Feb 20 00:45:03 2010 @@ -639,6 +639,7 @@ stockMap [_("Enable")] = GTK_STOCK_YES; stockMap [_("Disable")] = GTK_STOCK_NO; stockMap [_("Exit")] = GTK_STOCK_QUIT; + stockMap [_("Resize")] = GTK_STOCK_FULLSCREEN; } std::string id = cutUnderline (label); Modified: trunk/gtk/src/ygtkbargraph.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkbargraph.c?rev=60902… ============================================================================== --- trunk/gtk/src/ygtkbargraph.c (original) +++ trunk/gtk/src/ygtkbargraph.c Sat Feb 20 00:45:03 2010 @@ -23,7 +23,7 @@ static void ygtk_bar_graph_size_request (GtkWidget *widget, GtkRequisition *requisition) { GTK_WIDGET_CLASS (ygtk_bar_graph_parent_class)->size_request (widget, requisition); - requisition->height += 6; // give room for the labels + requisition->height += 18; // give room for the labels } GtkWidget *ygtk_bar_graph_new (void) -- 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] r60901 - /tags/stable-2_21_5/gtk/
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 20:56:19 2010 New Revision: 60901 URL: http://svn.opensuse.org/viewcvs/yast?rev=60901&view=rev Log: Created tag stable-2_21_5 for gtk Added: tags/stable-2_21_5/gtk/ - copied from r60900, trunk/gtk/ -- 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] r60900 - /tags/stable-2_21_5/
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 20:56:12 2010 New Revision: 60900 URL: http://svn.opensuse.org/viewcvs/yast?rev=60900&view=rev Log: Created tag stable-2_21_5 Added: tags/stable-2_21_5/ -- 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] r60899 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 20:56:07 2010 New Revision: 60899 URL: http://svn.opensuse.org/viewcvs/yast?rev=60899&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=60899&r1=60898&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Fri Feb 19 20:56:07 2010 @@ -1 +1 @@ -2.21.4 +2.21.5 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=60899&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Fri Feb 19 20:56:07 2010 @@ -1,4 +1,4 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "4") +SET(VERSION_PATCH "5") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Fri Feb 19 20:56:07 2010 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Feb 19 19:00:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt -- 2.21.1 - 2.21.4 +- 2.21.1 - 2.21.5 - build attempts. ------------------------------------------------------------------- -- 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] r60898 - /trunk/gtk/VERSION.cmake
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 20:55:19 2010 New Revision: 60898 URL: http://svn.opensuse.org/viewcvs/yast?rev=60898&view=rev Log: Added VERSION.cmake back. Added: trunk/gtk/VERSION.cmake Added: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=60898&view… ============================================================================== --- trunk/gtk/VERSION.cmake (added) +++ trunk/gtk/VERSION.cmake Fri Feb 19 20:55:19 2010 @@ -0,0 +1,4 @@ +SET(VERSION_MAJOR "2") +SET(VERSION_MINOR "21") +SET(VERSION_PATCH "4") + -- 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] r60897 - /tags/stable-2_21_4/gtk/
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 20:53:42 2010 New Revision: 60897 URL: http://svn.opensuse.org/viewcvs/yast?rev=60897&view=rev Log: Created tag stable-2_21_4 for gtk Added: tags/stable-2_21_4/gtk/ - copied from r60896, trunk/gtk/ -- 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] r60896 - /tags/stable-2_21_4/
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 20:53:34 2010 New Revision: 60896 URL: http://svn.opensuse.org/viewcvs/yast?rev=60896&view=rev Log: Created tag stable-2_21_4 Added: tags/stable-2_21_4/ -- 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] r60895 - in /trunk/gtk: VERSION VERSION.cmake
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 20:53:16 2010 New Revision: 60895 URL: http://svn.opensuse.org/viewcvs/yast?rev=60895&view=rev Log: VERSION.cmake -> VERSION Added: trunk/gtk/VERSION Removed: trunk/gtk/VERSION.cmake Added: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=60895&view=auto ============================================================================== --- trunk/gtk/VERSION (added) +++ trunk/gtk/VERSION Fri Feb 19 20:53:16 2010 @@ -0,0 +1 @@ +2.21.4 -- 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] r60894 - in /trunk/gtk: VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 20:31:43 2010 New Revision: 60894 URL: http://svn.opensuse.org/viewcvs/yast?rev=60894&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=60894&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Fri Feb 19 20:31:43 2010 @@ -1,3 +1,3 @@ set (VERSION_MAJOR "2") set (VERSION_MINOR "21") -set (VERSION_PATCH "3") +set (VERSION_PATCH "4") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Fri Feb 19 20:31:43 2010 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Feb 19 19:00:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt -- 2.21.1 - 2.21.3 +- 2.21.1 - 2.21.4 - build attempts. ------------------------------------------------------------------- -- 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] r60893 - /trunk/gtk/VERSION.cmake
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 20:12:45 2010 New Revision: 60893 URL: http://svn.opensuse.org/viewcvs/yast?rev=60893&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION.cmake Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=60893&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Fri Feb 19 20:12:45 2010 @@ -1,3 +1,3 @@ set (VERSION_MAJOR "2") set (VERSION_MINOR "21") -set (VERSION_PATCH "2") +set (VERSION_PATCH "3") -- 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] r60892 - in /trunk/gtk: CMakeLists.txt config.h.cmake package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 20:12:28 2010 New Revision: 60892 URL: http://svn.opensuse.org/viewcvs/yast?rev=60892&view=rev Log: - 2.21.1 - 2.21.3 - build attempts. Modified: trunk/gtk/CMakeLists.txt trunk/gtk/config.h.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/CMakeLists.txt?rev=60892&r1=… ============================================================================== --- trunk/gtk/CMakeLists.txt (original) +++ trunk/gtk/CMakeLists.txt Fri Feb 19 20:12:28 2010 @@ -31,7 +31,7 @@ include (YastCommon) set (YAST_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/YaST2) -set (DATADIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/gtk/) +#set (DATADIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/gtk/) set (LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/locale) set (THEMEDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current) Modified: trunk/gtk/config.h.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/config.h.cmake?rev=60892&r1=… ============================================================================== --- trunk/gtk/config.h.cmake (original) +++ trunk/gtk/config.h.cmake Fri Feb 19 20:12:28 2010 @@ -1,5 +1,4 @@ /* Important paths */ -#cmakedefine DATADIR "${DATADIR}" #cmakedefine THEMEDIR "${THEMEDIR}" #cmakedefine LOCALEDIR "${LOCALEDIR}" Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Fri Feb 19 20:12:28 2010 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Fri Feb 19 18:56:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt +Fri Feb 19 19:00:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt -- 2.21.1 - 2.21.2 +- 2.21.1 - 2.21.3 - build attempts. ------------------------------------------------------------------- -- 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] r60891 - in /trunk/gtk: VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 20:01:09 2010 New Revision: 60891 URL: http://svn.opensuse.org/viewcvs/yast?rev=60891&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=60891&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Fri Feb 19 20:01:09 2010 @@ -1,3 +1,3 @@ set (VERSION_MAJOR "2") set (VERSION_MINOR "21") -set (VERSION_PATCH "1") +set (VERSION_PATCH "2") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Fri Feb 19 20:01:09 2010 @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Fri Feb 19 18:56:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt -- 2.21.1 -- new build. +- 2.21.1 - 2.21.2 +- build attempts. ------------------------------------------------------------------- Fri Feb 19 16:51:03 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt -- 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] r60890 - in /trunk/gtk: VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 19:55:23 2010 New Revision: 60890 URL: http://svn.opensuse.org/viewcvs/yast?rev=60890&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=60890&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Fri Feb 19 19:55:23 2010 @@ -1,4 +1,3 @@ set (VERSION_MAJOR "2") set (VERSION_MINOR "21") -set (VERSION_PATCH "0") - +set (VERSION_PATCH "1") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Fri Feb 19 19:55:23 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 19 18:56:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.1 +- new build. + +------------------------------------------------------------------- Fri Feb 19 16:51:03 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.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] r60889 - in /trunk/gtk/src: ygtkscrolledwindow.c ygtkscrolledwindow.h
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 19:44:45 2010 New Revision: 60889 URL: http://svn.opensuse.org/viewcvs/yast?rev=60889&view=rev Log: Files no longer used or moved elsewhere. Removed: trunk/gtk/src/ygtkscrolledwindow.c trunk/gtk/src/ygtkscrolledwindow.h -- 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] r60888 - in /trunk/gtk/src: Makefile.am pkg-selector-help.h ygtkcellrendererbutton.c ygtkcellrendererbutton.h
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 19:43:42 2010 New Revision: 60888 URL: http://svn.opensuse.org/viewcvs/yast?rev=60888&view=rev Log: Files no longer used or moved elsewhere. Removed: trunk/gtk/src/Makefile.am trunk/gtk/src/pkg-selector-help.h trunk/gtk/src/ygtkcellrendererbutton.c trunk/gtk/src/ygtkcellrendererbutton.h -- 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] r60887 - /trunk/gtk/VERSION.cmake
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 19:34:04 2010 New Revision: 60887 URL: http://svn.opensuse.org/viewcvs/yast?rev=60887&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION.cmake Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=60887&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Fri Feb 19 19:34:04 2010 @@ -1,4 +1,4 @@ set (VERSION_MAJOR "2") -set (VERSION_MINOR "19") -set (VERSION_PATCH "5") +set (VERSION_MINOR "21") +set (VERSION_PATCH "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] r60886 - in /trunk/gtk: ./ package/ src/pkg/
by rpmcruz＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: rpmcruz Date: Fri Feb 19 19:11:23 2010 New Revision: 60886 URL: http://svn.opensuse.org/viewcvs/yast?rev=60886&view=rev Log: * src/pkg/ygtkpkgstatusbar.cc: got rid of "To install:" and other statistical info. * src/ygtkpkgfilterview.cc: moved orphaned to from pkg-groups to repositories. Modified: trunk/gtk/ChangeLog trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c trunk/gtk/src/pkg/ygtkpkgdetailview.cc trunk/gtk/src/pkg/ygtkpkgfilterview.cc trunk/gtk/src/pkg/ygtkpkgpatternview.cc trunk/gtk/src/pkg/ygtkpkgstatusbar.cc trunk/gtk/src/pkg/ygtkpkgstatusbar.h trunk/gtk/src/pkg/ygtkpkgundolist.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60886&r1=60885… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Feb 19 19:11:23 2010 @@ -1,3 +1,11 @@ +2010-02-19 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/ygtkpkgstatusbar.cc: got rid of "To install:" + and other statistical info. + + * src/ygtkpkgfilterview.cc: moved orphaned to from + pkg-groups to repositories. + 2010-02-18 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/ygtkpkglistview.h/cc: partial reversal on the Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Fri Feb 19 19:11:23 2010 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Fri Feb 19 16:51:03 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.0 +- Many UI fixes and improvements to the software manager and +online update. +- software manager code now resides in its own library, linked +only when needed. +- several bug fixes. + +------------------------------------------------------------------- Tue Oct 27 05:23:28 UTC 2009 - coolo(a)novell.com - cherry pick gcc 4.4 issues Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Fri Feb 19 19:11:23 2010 @@ -176,7 +176,7 @@ gtk_paned_pack2 (GTK_PANED (hpaned), createMainArea(), TRUE, FALSE); gtk_paned_set_position (GTK_PANED (hpaned), 200); - m_status = new YGtkPkgStatusBar (m_undo, false); + m_status = new YGtkPkgStatusBar (m_undo); m_widget = gtk_vbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (m_widget), hpaned, TRUE, TRUE, 0); @@ -627,11 +627,6 @@ impl->m_menu = new YGtkPkgMenuBar(); ygtk_wizard_set_custom_menu (wizard, impl->m_menu->getWidget(), FALSE); -/* - impl->m_status = new YGtkPkgStatusBar (impl->m_undo, true); - ygtk_wizard_set_status_bar (wizard, impl->m_status->getWidget()); -*/ - std::string str; str.reserve (6820); for (int i = 0; help[i]; i++) Modified: trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkcellrendererside… ============================================================================== --- trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c (original) +++ trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c Fri Feb 19 19:11:23 2010 @@ -167,14 +167,11 @@ GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path, GdkRectangle *background_area, GdkRectangle *cell_area, GtkCellRendererState flags) { -// FIXME: only emit signal if the button (and not the text) has been pressed -fprintf (stderr, "cell_area->x: %d\n", cell_area->x); YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (cell); if (bcell->button_visible) { GdkEventButton *_event = (GdkEventButton *) event; gint icon_width, icon_height; gtk_icon_size_lookup (GTK_ICON_SIZE_BUTTON, &icon_width, &icon_height); -fprintf (stderr, "button pressed at: %f\n", _event->x); int icon_x, x = _event->x - cell_area->x; if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) icon_x = 2; Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Fri Feb 19 19:11:23 2010 @@ -144,7 +144,6 @@ } } ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str()); -fprintf (stderr, "description text: %s\n\n\n", str.c_str()); } static void link_clicked_cb (YGtkRichText *text, const gchar *link, DetailDescription *pThis) @@ -801,8 +800,6 @@ if (dep == 0 || dep == 2) ret += "</a>"; } -if (!ret.empty()) -fprintf (stderr, "dep (%d) text: %s\n\n\n", dep, ret.c_str()); return ret; } @@ -923,7 +920,6 @@ inner::traverse (tree.root(), text); } -fprintf (stderr, "filelist: %s\n\n\n", text.c_str()); return text; } }; @@ -970,7 +966,6 @@ text += date + " (" + author + "): <blockquote>" + changes + "</blockquote>"; } } -fprintf (stderr, "changelog: %s\n\n\n", text.c_str()); return text; } }; @@ -1054,7 +1049,6 @@ } } } -fprintf (stderr, "authors: %s\n\n\n", text.c_str()); return text; } }; Modified: trunk/gtk/src/pkg/ygtkpkgfilterview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgfilterview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgfilterview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgfilterview.cc Fri Feb 19 19:11:23 2010 @@ -251,6 +251,7 @@ for (int i = YPKG_GROUP_UNKNOWN; i < YPKG_GROUP_TOTAL; i++) { if (i == YPKG_GROUP_MULTIVERSION /* && zypp::sat::Pool::instance().multiversionEmpty() */) continue; + if (i == YPKG_GROUP_ORPHANED) continue; std::string name = zypp_tag_group_enum_to_localised_text ((YPkgGroupEnum) i); const char *icon = zypp_tag_enum_to_icon ((YPkgGroupEnum) i); if (i == YPKG_GROUP_RECENT) @@ -313,6 +314,8 @@ addRow (icon, label.c_str(), false, GINT_TO_POINTER (0)); } } + + addRow ("gtk-missing-image", _("None"), true, GINT_TO_POINTER (1)); } YGtkPkgRepositoryModel::~YGtkPkgRepositoryModel() @@ -320,7 +323,11 @@ void YGtkPkgRepositoryModel::updateRow (Ypp::List list, int row, gpointer data) { - if (data) { + if (GPOINTER_TO_INT (data) == 1) { // 'none' + Ypp::PKGroupMatch match (YPKG_GROUP_ORPHANED); + setRowCount (row, list.count (&match)); + } + else if (data) { Ypp::Repository &repo = impl->repos[row-1]; bool isSystem = repo.isSystem(); int count = 0; @@ -338,16 +345,20 @@ } } } - setRowCount (row, count); } + // else - disabled repos } bool YGtkPkgRepositoryModel::writeRowQuery (Ypp::PoolQuery &query, int row, gpointer data) { - Ypp::Repository &repo = impl->repos[row-1]; - query.addRepository (repo); - impl->selected = &repo; + if (data) { + Ypp::Repository &repo = impl->repos[row-1]; + query.addRepository (repo); + impl->selected = &repo; + } + else // 'none' + query.addCriteria (new Ypp::PKGroupMatch (YPKG_GROUP_ORPHANED)); return true; } Modified: trunk/gtk/src/pkg/ygtkpkgpatternview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgpatternview.c… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgpatternview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgpatternview.cc Fri Feb 19 19:11:23 2010 @@ -450,7 +450,6 @@ if (gtk_tree_selection_get_selected (selection, &model, &iter)) { Ypp::Selectable sel (get_iter_selectable (model, &iter)); Ypp::Collection collection (sel); -fprintf (stderr, "add criteria match: %s\n", sel.name().c_str()); query.addCriteria (new Ypp::CollectionMatch (collection)); return true; } Modified: trunk/gtk/src/pkg/ygtkpkgstatusbar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgstatusbar.cc?… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgstatusbar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgstatusbar.cc Fri Feb 19 19:11:23 2010 @@ -64,11 +64,12 @@ LastChange() { +#if 0 icon = gtk_image_new(); gtk_widget_set_size_request (icon, 16, 16); +#endif text = gtk_label_new (""); gtk_misc_set_alignment (GTK_MISC (text), 0, .5); - gtk_label_set_ellipsize (GTK_LABEL (text), PANGO_ELLIPSIZE_END); undo_button = create_small_button (GTK_STOCK_UNDO, _("Undo")); g_signal_connect (G_OBJECT (undo_button), "clicked", G_CALLBACK (undo_clicked_cb), this); @@ -81,7 +82,9 @@ G_CALLBACK (more_link_cb), this); hbox = gtk_hbox_new (FALSE, 6); +#if 0 gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, TRUE, 0); +#endif gtk_box_pack_start (GTK_BOX (hbox), text, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), undo_button, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), more, FALSE, TRUE, 0); @@ -92,13 +95,14 @@ int auto_count; Ypp::Selectable *sel = list->front (&auto_count); if (sel) { +#if 0 const char *stock = getStatusStockIcon (*sel); GdkPixbuf *pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(), stock, 16, GtkIconLookupFlags (0), NULL); - GdkPixbuf *_pixbuf = YGUtils::setGray (pixbuf); - gtk_image_set_from_pixbuf (GTK_IMAGE (icon), _pixbuf); + //GdkPixbuf *_pixbuf = YGUtils::setGray (pixbuf); + gtk_image_set_from_pixbuf (GTK_IMAGE (icon), pixbuf); g_object_unref (G_OBJECT (pixbuf)); - g_object_unref (G_OBJECT (_pixbuf)); +#endif const char *action; if (sel->toInstall()) { @@ -128,18 +132,17 @@ else format = "%s %s"; gchar *str = g_strdup_printf (format, action, sel->name().c_str(), auto_count); - gtk_label_set_text (GTK_LABEL (text), str); - gtk_widget_set_sensitive (text, TRUE); + gtk_label_set_markup (GTK_LABEL (text), str); gtk_widget_set_sensitive (undo_button, TRUE); g_free (str); } else { +#if 0 gtk_image_clear (GTK_IMAGE (icon)); - gtk_label_set_text (GTK_LABEL (text), _("No changes to perform")); - gtk_widget_set_sensitive (text, FALSE); +#endif + gtk_label_set_markup (GTK_LABEL (text), _("No changes to perform")); gtk_widget_set_sensitive (undo_button, FALSE); } - gtk_label_set_use_markup (GTK_LABEL (text), TRUE); } static gboolean more_link_cb (GtkLabel *label, gchar *uri, LastChange *pThis) @@ -152,6 +155,7 @@ } }; +#if 0 struct StatChange { GtkWidget *hbox, *to_install, *to_upgrade, *to_remove; @@ -205,6 +209,7 @@ g_free (str); } }; +#endif #define MIN_FREE_MB_WARN 400 #define MIN_PERCENT_WARN 90 @@ -214,7 +219,7 @@ GtkWidget *getWidget() { return hbox; } - DiskChange (bool small) + DiskChange() { GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING); std::vector <std::string> partitions = Ypp::getPartitionList(); @@ -237,8 +242,6 @@ gtk_widget_set_name (combo, "small-widget"); gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (combo), FALSE); GtkCellRenderer *renderer = gtk_cell_renderer_text_new(); - if (small) - g_object_set (G_OBJECT (renderer), "scale", .70, NULL); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer, "text", 0, NULL); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), active); @@ -284,38 +287,19 @@ struct YGtkPkgStatusBar::Impl : public YGtkPkgUndoList::Listener { GtkWidget *box; LastChange *last; - StatChange *stat; DiskChange *disk; GtkWidget *getWidget() { return box; } - Impl (YGtkPkgUndoList *undo, bool real_bar) + Impl (YGtkPkgUndoList *undo) { last = new LastChange(); - stat = new StatChange(); - disk = new DiskChange (real_bar); + disk = new DiskChange(); GtkWidget *hbox = gtk_hbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (hbox), last->getWidget(), TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), gtk_vseparator_new(), FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), stat->getWidget(), FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), gtk_vseparator_new(), FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), disk->getWidget(), FALSE, TRUE, 0); - - if (real_bar) { - GtkWidget *status = gtk_statusbar_new(); - gtk_box_pack_start (GTK_BOX (hbox), status, FALSE, TRUE, 0); - gtk_widget_set_size_request (status, 25, -1); - gtk_widget_set_size_request (last->getWidget(), -1, 0); - gtk_widget_set_size_request (stat->getWidget(), -1, 0); - gtk_widget_set_size_request (disk->getWidget(), -1, 0); - - box = gtk_vbox_new (FALSE, 1); - gtk_box_pack_start (GTK_BOX (box), gtk_hseparator_new(), FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE, 0); - } - else - box = hbox; + gtk_box_pack_start (GTK_BOX (hbox), last->getWidget(), FALSE, TRUE, 0); + gtk_box_pack_end (GTK_BOX (hbox), disk->getWidget(), FALSE, TRUE, 0); + box = hbox; gtk_widget_show_all (box); undoChanged (undo); @@ -325,7 +309,6 @@ ~Impl() { delete last; - delete stat; delete disk; YGPackageSelector::get()->undoList()->removeListener (this); } @@ -333,13 +316,12 @@ virtual void undoChanged (YGtkPkgUndoList *list) { last->undoChanged (list); - stat->undoChanged (list); disk->undoChanged (list); } }; -YGtkPkgStatusBar::YGtkPkgStatusBar (YGtkPkgUndoList *undo, bool real_bar) -: impl (new Impl (undo, real_bar)) +YGtkPkgStatusBar::YGtkPkgStatusBar (YGtkPkgUndoList *undo) +: impl (new Impl (undo)) {} YGtkPkgStatusBar::~YGtkPkgStatusBar() Modified: trunk/gtk/src/pkg/ygtkpkgstatusbar.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgstatusbar.h?r… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgstatusbar.h (original) +++ trunk/gtk/src/pkg/ygtkpkgstatusbar.h Fri Feb 19 19:11:23 2010 @@ -14,7 +14,7 @@ struct YGtkPkgStatusBar { - YGtkPkgStatusBar (YGtkPkgUndoList *undo, bool realStatusBar); + YGtkPkgStatusBar (YGtkPkgUndoList *undo); ~YGtkPkgStatusBar(); GtkWidget *getWidget(); Modified: trunk/gtk/src/pkg/ygtkpkgundolist.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgundolist.cc?r… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgundolist.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgundolist.cc Fri Feb 19 19:11:23 2010 @@ -243,7 +243,7 @@ gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 500); YGtkPkgListView view (true, -1); - view.addImageColumn (_("Status"), STATUS_ICON_PROP); + view.addImageColumn (_("Action"), STATUS_ICON_PROP); view.addTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1, true); view.addTextColumn (_("Version"), VERSION_PROP, true, 125); view.addUndoButtonColumn (_("Revert?")); -- 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] r60885 - /tags/stable-2_18_3/samba-server/
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 17:25:30 2010 New Revision: 60885 URL: http://svn.opensuse.org/viewcvs/yast?rev=60885&view=rev Log: Created tag stable-2_18_3 for samba-server Added: tags/stable-2_18_3/samba-server/ - copied from r60884, trunk/samba-server/ -- 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] r60884 - /tags/branch-Code-11-SP1-2_17_11/samba-server/
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 17:22:51 2010 New Revision: 60884 URL: http://svn.opensuse.org/viewcvs/yast?rev=60884&view=rev Log: Created tag branch-Code-11-SP1-2_17_11 for samba-server Added: tags/branch-Code-11-SP1-2_17_11/samba-server/ (props changed) - copied from r60883, branches/SuSE-Code-11-SP1-Branch/samba-server/ -- 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] r60883 - in /trunk/samba-server: VERSION package/yast2-samba-server.changes src/dialogs.ycp src/helps.ycp
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 17:22:09 2010 New Revision: 60883 URL: http://svn.opensuse.org/viewcvs/yast?rev=60883&view=rev Log: - Re-added possibility to allow guest access (BNC #579993). - Fixed buggy behavior when security settings were manually changed by user in advanced options (BNC #553349). - Adjusted help according the current UI (BNC #580102). - 2.18.3 Modified: trunk/samba-server/VERSION trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/dialogs.ycp trunk/samba-server/src/helps.ycp Modified: trunk/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=60883&r… ============================================================================== --- trunk/samba-server/VERSION (original) +++ trunk/samba-server/VERSION Fri Feb 19 17:22:09 2010 @@ -1 +1 @@ -2.18.2 +2.18.3 Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba… ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Fri Feb 19 17:22:09 2010 @@ -1,4 +1,13 @@ ------------------------------------------------------------------ +Fri Feb 19 16:55:02 CET 2010 - locilka(a)suse.cz + +- Re-added possibility to allow guest access (BNC #579993). +- Fixed buggy behavior when security settings were manually + changed by user in advanced options (BNC #553349). +- Adjusted help according the current UI (BNC #580102). +- 2.18.3 + +------------------------------------------------------------------ Mon Jan 25 17:00:20 CET 2010 - locilka(a)suse.cz - Import sets Modified to true (BNC #572670). Modified: trunk/samba-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/dialogs.ycp?rev… ============================================================================== --- trunk/samba-server/src/dialogs.ycp (original) +++ trunk/samba-server/src/dialogs.ycp Fri Feb 19 17:22:09 2010 @@ -205,10 +205,11 @@ void BaseSettingsWidgetInit(string key) { UI::ChangeWidget(`id("workgroup_domainname"), `Value, SambaConfig::GlobalGetStr("workgroup", "")); - UI::ChangeWidget(`id("domain_controller"), `Value, getRole()); // initial for this dialog - initial_role = SambaRole::GetRole(); + // see also BNC #553349 + initial_role = getRole(); + UI::ChangeWidget(`id("domain_controller"), `Value, initial_role); y2milestone ("Initial role: %1", initial_role); } @@ -321,6 +322,8 @@ boolean allow_share = true; integer max_shares = 0; string shares_group = ""; +// Guest Access check-box, BNC #579993 +boolean guest_access = false; void InitUserShareWidgets () { max_shares = Samba::GetMaxShares (); @@ -332,11 +335,14 @@ allow_share = true; } + guest_access = allow_share && Samba::GetGuessAccess(); + shares_group = Samba::shares_group; UI::ChangeWidget (`id(`group), `Value, shares_group); UI::ChangeWidget (`id(`max_shares), `Value, max_shares); UI::ChangeWidget (`id(`share_ch), `Value, allow_share); + UI::ChangeWidget (`id(`guest_ch), `Value, guest_access); } void AdjustUserShareWidgets () { @@ -906,6 +912,8 @@ "allow_share" : allow_share, "group" : shares_group, "max_shares" : max_shares, + // BNC #579993, Allow guest access + "guest_access": guest_access, ]), `HSpacing(1) ), Modified: trunk/samba-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/helps.ycp?rev=6… ============================================================================== --- trunk/samba-server/src/helps.ycp (original) +++ trunk/samba-server/src/helps.ycp Fri Feb 19 17:22:09 2010 @@ -175,32 +175,38 @@ creating new users and groups. If the administration DN requires a password for write access, set the password using Set LDAP Administration Password. -")+ +") + /* Advanced SAMBA configuration dialog help 3/3 */ _("Note: Settings are saved before the LDAP administration password is set. "), - /* passdb backend configuration dialog help 1/7 */ + /* passdb backend configuration dialog help 1 */ "passdb_edit" : _("<big>User Authentication Information Back-Ends</big> Here, choose where the Samba server should look for the authentication information. Samba does not support multiple back-ends at once anymore, only one is allowed. ") + - /* passdb backend configuration dialog help 2/7 */ + + /* passdb backend configuration dialog help 2 */ +_("If you want to change the user authentication source, remove the current one first +by pressing Delete button and add a new one with Add button. +") + + + /* passdb backend configuration dialog help 3 */ _("smbpasswd file is the file using the same format as the previous versions of Samba. Its layout is similar to the passwd file. It is possible to have a multiple files in this format. ") + - /* passdb backend configuration dialog help 3/7 */ + /* passdb backend configuration dialog help 4 */ _("LDAP is a URL of an LDAP server to check for the information. ") + - /* passdb backend configuration dialog help 4/7 */ + /* passdb backend configuration dialog help 5 */ _("TDB database uses an internal Samba database binary format to store and look up the information. -") + +"), // we don't seem to support mysql anymore // /* passdb backend configuration dialog help 5/7 */ @@ -208,12 +214,13 @@ //to store and look up the information. //") + +// not in UI anymore /* passdb backend configuration dialog help 6/7 */ -_("Use Add to add a new configuration option, Edit to modify -an existing option, and Delete to delete an option. -Use Up and Down to change the order -of the back-ends. -"), +//_("Use Add to add a new configuration option, Edit to modify +//an existing option, and Delete to delete an option. +//Use Up and Down to change the order +//of the back-ends. +//"), // no such button there // /* passdb backend configuration dialog help 7/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] r60882 - in /branches/SuSE-Code-11-SP1-Branch/samba-server: VERSION package/yast2-samba-server.changes src/dialogs.ycp src/helps.ycp
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 17:21:45 2010 New Revision: 60882 URL: http://svn.opensuse.org/viewcvs/yast?rev=60882&view=rev Log: - Re-added possibility to allow guest access (BNC #579993). - Fixed buggy behavior when security settings were manually changed by user in advanced options (BNC #553349). - Adjusted help according the current UI (BNC #580102). - 2.17.11 Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes branches/SuSE-Code-11-SP1-Branch/samba-server/src/dialogs.ycp branches/SuSE-Code-11-SP1-Branch/samba-server/src/helps.ycp Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION Fri Feb 19 17:21:45 2010 @@ -1 +1 @@ -2.17.10 +2.17.11 Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes Fri Feb 19 17:21:45 2010 @@ -1,4 +1,13 @@ ------------------------------------------------------------------ +------------------------------------------------------------------- +Fri Feb 19 16:55:02 CET 2010 - locilka(a)suse.cz + +- Re-added possibility to allow guest access (BNC #579993). +- Fixed buggy behavior when security settings were manually + changed by user in advanced options (BNC #553349). +- Adjusted help according the current UI (BNC #580102). +- 2.17.11 + +------------------------------------------------------------------- Mon Jan 25 17:00:20 CET 2010 - locilka(a)suse.cz - Import sets Modified to true (BNC #572670). Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/src/dialogs.ycp Fri Feb 19 17:21:45 2010 @@ -205,10 +205,11 @@ void BaseSettingsWidgetInit(string key) { UI::ChangeWidget(`id("workgroup_domainname"), `Value, SambaConfig::GlobalGetStr("workgroup", "")); - UI::ChangeWidget(`id("domain_controller"), `Value, getRole()); // initial for this dialog - initial_role = SambaRole::GetRole(); + // see also BNC #553349 + initial_role = getRole(); + UI::ChangeWidget(`id("domain_controller"), `Value, initial_role); y2milestone ("Initial role: %1", initial_role); } @@ -321,6 +322,8 @@ boolean allow_share = true; integer max_shares = 0; string shares_group = ""; +// Guest Access check-box, BNC #579993 +boolean guest_access = false; void InitUserShareWidgets () { max_shares = Samba::GetMaxShares (); @@ -332,11 +335,14 @@ allow_share = true; } + guest_access = allow_share && Samba::GetGuessAccess(); + shares_group = Samba::shares_group; UI::ChangeWidget (`id(`group), `Value, shares_group); UI::ChangeWidget (`id(`max_shares), `Value, max_shares); UI::ChangeWidget (`id(`share_ch), `Value, allow_share); + UI::ChangeWidget (`id(`guest_ch), `Value, guest_access); } void AdjustUserShareWidgets () { @@ -906,6 +912,8 @@ "allow_share" : allow_share, "group" : shares_group, "max_shares" : max_shares, + // BNC #579993, Allow guest access + "guest_access": guest_access, ]), `HSpacing(1) ), Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/src/helps.ycp Fri Feb 19 17:21:45 2010 @@ -175,32 +175,38 @@ creating new users and groups. If the administration DN requires a password for write access, set the password using Set LDAP Administration Password. -")+ +") + /* Advanced SAMBA configuration dialog help 3/3 */ _("Note: Settings are saved before the LDAP administration password is set. "), - /* passdb backend configuration dialog help 1/7 */ + /* passdb backend configuration dialog help 1 */ "passdb_edit" : _("<big>User Authentication Information Back-Ends</big> Here, choose where the Samba server should look for the authentication information. Samba does not support multiple back-ends at once anymore, only one is allowed. ") + - /* passdb backend configuration dialog help 2/7 */ + + /* passdb backend configuration dialog help 2 */ +_("If you want to change the user authentication source, remove the current one first +by pressing Delete button and add a new one with Add button. +") + + + /* passdb backend configuration dialog help 3 */ _("smbpasswd file is the file using the same format as the previous versions of Samba. Its layout is similar to the passwd file. It is possible to have a multiple files in this format. ") + - /* passdb backend configuration dialog help 3/7 */ + /* passdb backend configuration dialog help 4 */ _("LDAP is a URL of an LDAP server to check for the information. ") + - /* passdb backend configuration dialog help 4/7 */ + /* passdb backend configuration dialog help 5 */ _("TDB database uses an internal Samba database binary format to store and look up the information. -") + +"), // we don't seem to support mysql anymore // /* passdb backend configuration dialog help 5/7 */ @@ -208,12 +214,13 @@ //to store and look up the information. //") + +// not in UI anymore /* passdb backend configuration dialog help 6/7 */ -_("Use Add to add a new configuration option, Edit to modify -an existing option, and Delete to delete an option. -Use Up and Down to change the order -of the back-ends. -"), +//_("Use Add to add a new configuration option, Edit to modify +//an existing option, and Delete to delete an option. +//Use Up and Down to change the order +//of the back-ends. +//"), // no such button there // /* passdb backend configuration dialog help 7/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] r60881 - /tags/branch-Code-11-SP1-2_17_92/storage/
by aschnell＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: aschnell Date: Fri Feb 19 15:34:11 2010 New Revision: 60881 URL: http://svn.opensuse.org/viewcvs/yast?rev=60881&view=rev Log: Created tag branch-Code-11-SP1-2_17_92 for storage Added: tags/branch-Code-11-SP1-2_17_92/storage/ (props changed) - copied from r60880, branches/SuSE-Code-11-SP1-Branch/storage/ -- 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] r60880 - /tags/branch-Code-11-SP1-2_17_92/
by aschnell＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: aschnell Date: Fri Feb 19 15:34:06 2010 New Revision: 60880 URL: http://svn.opensuse.org/viewcvs/yast?rev=60880&view=rev Log: Created tag branch-Code-11-SP1-2_17_92 Added: tags/branch-Code-11-SP1-2_17_92/ -- 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] r60879 - in /branches/SuSE-Code-11-SP1-Branch/storage: VERSION package/yast2-storage.changes
by aschnell＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: aschnell Date: Fri Feb 19 15:32:53 2010 New Revision: 60879 URL: http://svn.opensuse.org/viewcvs/yast?rev=60879&view=rev Log: - increased version Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/VERSION Fri Feb 19 15:32:53 2010 @@ -1 +1 @@ -2.17.91 +2.17.92 Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Fri Feb 19 15:32:53 2010 @@ -2,6 +2,7 @@ Fri Feb 19 13:52:42 CET 2010 - aschnell(a)suse.de - allow setting of imsm_driver via env.var. (bnc #574270) +- 2.17.92 ------------------------------------------------------------------- Mon Feb 08 14:03:47 CET 2010 - aschnell(a)suse.de -- 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] r60878 - in /branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src: MdPartCo.cc MdPartCo.h
by aschnell＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: aschnell Date: Fri Feb 19 14:25:06 2010 New Revision: 60878 URL: http://svn.opensuse.org/viewcvs/yast?rev=60878&view=rev Log: - fixed use of MdPartCo::getContMember Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc Fri Feb 19 14:25:06 2010 @@ -2067,19 +2067,22 @@ updateEntry(); } -int MdPartCo::getContMember() + +string +MdPartCo::getContMember() const { - string::size_type pos = md_metadata.find_last_of("/"); - if( pos != string::npos ) - { - unsigned mem; - string tmp = md_metadata; - tmp.erase(0,pos+1); - tmp >> mem; - return mem; + y2mil("md_metadata:" << md_metadata); + string::size_type pos = md_metadata.find_last_of("/"); + if (pos != string::npos) + { + string tmp = md_metadata; + tmp.erase(0, pos + 1); + return tmp; } - return -1; + return string(); } + + void MdPartCo::updateEntry() { EtcRaidtab* tab = getStorage()->getRaidtab(); Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h Fri Feb 19 14:25:06 2010 @@ -322,8 +322,7 @@ enum mdMap { MAP_DEV=0, MAP_META, MAP_UUID, MAP_NAME, }; static bool findMdMap(std::ifstream& file); - - int getContMember(); + string getContMember() const; //Input: 'mdXXX' device. static storage::CType envSelection(const string& 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] r60877 - in /branches/SuSE-Code-11-SP1-Branch/storage: libstorage/src/Storage.cc package/yast2-storage.changes
by aschnell＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: aschnell Date: Fri Feb 19 13:58:48 2010 New Revision: 60877 URL: http://svn.opensuse.org/viewcvs/yast?rev=60877&view=rev Log: - allow setting of imsm_driver via env.var. (bnc #574270) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Fri Feb 19 13:58:48 2010 @@ -106,18 +106,19 @@ Storage::Storage(const Environment& env) - : env(env), lock(readonly(), testmode()), initialized(false) + : env(env), lock(readonly(), testmode()), initialized(false), fstab(NULL), raidtab(NULL), + imsm_driver(IMSM_UNDECIDED) { y2mil("constructed Storage with " << env); y2mil("package string \"" PACKAGE_STRING "\""); - char * tenv = getenv( "YAST_IS_RUNNING" ); + root_mounted = !instsys(); efiboot = false; hald_pid = 0; max_log_num = 5; - tenv = getenv( "Y2MAXLOGNUM" ); - if( tenv!=0 ) + const char* tenv = getenv("Y2MAXLOGNUM"); + if (tenv) string(tenv) >> max_log_num; y2mil("max_log_num:" << max_log_num); @@ -132,10 +133,14 @@ defaultMountBy = MOUNTBY_ID; detectMounted = true; - fstab = NULL; - raidtab = NULL; - - imsm_driver = IMSM_UNDECIDED; + tenv = getenv("LIBSTORAGE_IMSM_DRIVER"); + if (tenv) + { + if (boost::iequals(tenv, "DMRAID", locale::classic())) + imsm_driver = IMSM_DMRAID; + else if (boost::iequals(tenv, "MDADM", locale::classic())) + imsm_driver = IMSM_MDADM; + } logSystemInfo(); } Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Fri Feb 19 13:58:48 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 19 13:52:42 CET 2010 - aschnell(a)suse.de + +- allow setting of imsm_driver via env.var. (bnc #574270) + +------------------------------------------------------------------- Mon Feb 08 14:03:47 CET 2010 - aschnell(a)suse.de - do not allow deletion of partitions on DASD when other partitions -- 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] r60876 - /tags/branch-Code-11-2_17_8_6/wagon/
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 13:23:40 2010 New Revision: 60876 URL: http://svn.opensuse.org/viewcvs/yast?rev=60876&view=rev Log: Created tag branch-Code-11-2_17_8_6 for wagon Added: tags/branch-Code-11-2_17_8_6/wagon/ - copied from r60875, branches/SuSE-Code-11-Branch/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] r60875 - /tags/branch-Code-11-2_17_8_6/
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 13:23:38 2010 New Revision: 60875 URL: http://svn.opensuse.org/viewcvs/yast?rev=60875&view=rev Log: Created tag branch-Code-11-2_17_8_6 Added: tags/branch-Code-11-2_17_8_6/ -- 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] r60874 - in /branches/SuSE-Code-11-Branch/wagon: VERSION package/yast2-wagon.changes
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 13:22:40 2010 New Revision: 60874 URL: http://svn.opensuse.org/viewcvs/yast?rev=60874&view=rev Log: New version Modified: branches/SuSE-Code-11-Branch/wagon/VERSION branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Modified: branches/SuSE-Code-11-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-Branch/wagon/VERSION Fri Feb 19 13:22:40 2010 @@ -1 +1 @@ -2.17.8.5 +2.17.8.6 Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Fri Feb 19 13:22:40 2010 @@ -5,6 +5,7 @@ packages) but do not describe products in metadata (BNC #579905). - Cleanup before and after suse_register (BNC #580523). - Added macro-recording. +- 2.17.8.6 ------------------------------------------------------------------- Fri Feb 5 16:12:02 CET 2010 - 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] r60873 - /tags/branch-Code-11-SP1-2_17_15/wagon/
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 13:20:01 2010 New Revision: 60873 URL: http://svn.opensuse.org/viewcvs/yast?rev=60873&view=rev Log: Created tag branch-Code-11-SP1-2_17_15 for wagon Added: tags/branch-Code-11-SP1-2_17_15/wagon/ (props changed) - copied from r60872, branches/SuSE-Code-11-SP1-Branch/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] r60872 - in /branches/SuSE-Code-11-SP1-Branch/wagon: VERSION package/yast2-wagon.changes
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 13:18:49 2010 New Revision: 60872 URL: http://svn.opensuse.org/viewcvs/yast?rev=60872&view=rev Log: New version Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Fri Feb 19 13:18:49 2010 @@ -1 +1 @@ -2.17.14 +2.17.15 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Fri Feb 19 13:18:49 2010 @@ -5,6 +5,7 @@ packages) but do not describe products in metadata (BNC #579905). - Cleanup before and after suse_register (BNC #580523). - Added macro-recording. +- 2.17.15 ------------------------------------------------------------------- Fri Feb 5 16:12:02 CET 2010 - 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] r60871 - /branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_registration_handler.ycp
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 12:58:14 2010 New Revision: 60871 URL: http://svn.opensuse.org/viewcvs/yast?rev=60871&view=rev Log: Added some more logging for debugging registration issues later Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_registration_handler.ycp Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_registration_handler.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_registration_handler.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_registration_handler.ycp Fri Feb 19 12:58:14 2010 @@ -59,6 +59,7 @@ // all repository aliases list <string> all_repos = GetCurrentlyEnabledReposByAlias(); + y2milestone ("Currently registered repositories: %1", all_repos); // BNC #576553: Adjusts suse_config sysconfig values according the control file AdjustSuseRegisterDefaults(); @@ -70,7 +71,9 @@ while (true) { // Only in mode=="normal" suse_register reads settings from sysconfig Mode::SetMode ("normal"); + y2milestone ("Running inst_suse_register..."); ret = (symbol) WFM::CallFunction ("inst_suse_register", WFM::Args()); + y2milestone ("Script inst_suse_register returned: %1", ret); Mode::SetMode ("update"); AdjustRegistrationHandlerScreen(); @@ -85,9 +88,10 @@ // Registration must have done something with repositories // e.g., register new ones, disable old ones - that's wanted - if (all_repos != GetCurrentlyEnabledReposByAlias()) { + list <string> current_repos = GetCurrentlyEnabledReposByAlias(); + if (all_repos != current_repos) { Wagon::repos_already_registered = true; - y2milestone ("List of repositories has changed"); + y2milestone ("List of repositories has changed: %1", current_repos); break; } @@ -97,6 +101,8 @@ break; } + y2warning ("Repos were not changed: %1", current_repos); + // Never called before, nothing changed if (Popup::AnyQuestion ( // dialog caption -- 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] r60870 - /branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 12:57:57 2010 New Revision: 60870 URL: http://svn.opensuse.org/viewcvs/yast?rev=60870&view=rev Log: Added some more logging for debugging registration issues later Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp Fri Feb 19 12:57:57 2010 @@ -59,6 +59,7 @@ // all repository aliases list <string> all_repos = GetCurrentlyEnabledReposByAlias(); + y2milestone ("Currently registered repositories: %1", all_repos); // BNC #576553: Adjusts suse_config sysconfig values according the control file AdjustSuseRegisterDefaults(); @@ -70,7 +71,9 @@ while (true) { // Only in mode=="normal" suse_register reads settings from sysconfig Mode::SetMode ("normal"); + y2milestone ("Running inst_suse_register..."); ret = (symbol) WFM::CallFunction ("inst_suse_register", WFM::Args()); + y2milestone ("Script inst_suse_register returned: %1", ret); Mode::SetMode ("update"); AdjustRegistrationHandlerScreen(); @@ -85,9 +88,10 @@ // Registration must have done something with repositories // e.g., register new ones, disable old ones - that's wanted - if (all_repos != GetCurrentlyEnabledReposByAlias()) { + list <string> current_repos = GetCurrentlyEnabledReposByAlias(); + if (all_repos != current_repos) { Wagon::repos_already_registered = true; - y2milestone ("List of repositories has changed"); + y2milestone ("List of repositories has changed: %1", current_repos); break; } @@ -97,6 +101,8 @@ break; } + y2warning ("Repos were not changed: %1", current_repos); + // Never called before, nothing changed if (Popup::AnyQuestion ( // dialog caption -- 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] r60869 - /trunk/wagon/src/clients/wagon_registration_handler.ycp
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 12:57:49 2010 New Revision: 60869 URL: http://svn.opensuse.org/viewcvs/yast?rev=60869&view=rev Log: Added some more logging for debugging registration issues later Modified: trunk/wagon/src/clients/wagon_registration_handler.ycp Modified: trunk/wagon/src/clients/wagon_registration_handler.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_registra… ============================================================================== --- trunk/wagon/src/clients/wagon_registration_handler.ycp (original) +++ trunk/wagon/src/clients/wagon_registration_handler.ycp Fri Feb 19 12:57:49 2010 @@ -59,6 +59,7 @@ // all repository aliases list <string> all_repos = GetCurrentlyEnabledReposByAlias(); + y2milestone ("Currently registered repositories: %1", all_repos); // BNC #576553: Adjusts suse_config sysconfig values according the control file AdjustSuseRegisterDefaults(); @@ -70,7 +71,9 @@ while (true) { // Only in mode=="normal" suse_register reads settings from sysconfig Mode::SetMode ("normal"); + y2milestone ("Running inst_suse_register..."); ret = (symbol) WFM::CallFunction ("inst_suse_register", WFM::Args()); + y2milestone ("Script inst_suse_register returned: %1", ret); Mode::SetMode ("update"); AdjustRegistrationHandlerScreen(); @@ -85,9 +88,10 @@ // Registration must have done something with repositories // e.g., register new ones, disable old ones - that's wanted - if (all_repos != GetCurrentlyEnabledReposByAlias()) { + list <string> current_repos = GetCurrentlyEnabledReposByAlias(); + if (all_repos != current_repos) { Wagon::repos_already_registered = true; - y2milestone ("List of repositories has changed"); + y2milestone ("List of repositories has changed: %1", current_repos); break; } @@ -97,6 +101,8 @@ break; } + y2warning ("Repos were not changed: %1", current_repos); + // Never called before, nothing changed if (Popup::AnyQuestion ( // dialog caption -- 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] r60868 - in /trunk/wagon: package/yast2-wagon.changes src/clients/wagon.ycp
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 12:40:43 2010 New Revision: 60868 URL: http://svn.opensuse.org/viewcvs/yast?rev=60868&view=rev Log: - Added macro-recording. Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon.ycp 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 Fri Feb 19 12:40:43 2010 @@ -4,6 +4,7 @@ - Disabling also repositories that provide installed products (as packages) but do not describe products in metadata (BNC #579905). - Cleanup before and after suse_register (BNC #580523). +- Added macro-recording. ------------------------------------------------------------------- Fri Feb 5 16:12:02 CET 2010 - locilka(a)suse.cz Modified: trunk/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/clients/wagon.ycp (original) +++ trunk/wagon/src/clients/wagon.ycp Fri Feb 19 12:40:43 2010 @@ -111,6 +111,9 @@ // Checks whether YaST has been restarted // Adjust step to start with void HandleInit () { + // logs what user does in UI + UI::RecordMacro (Directory::logdir + "/macro_online_migration.ycp"); + if (FileUtils::Exists (do_restart)) { y2milestone ("YaST has been restarted"); SCR::Execute (.target.remove, do_restart); -- 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] r60867 - in /branches/SuSE-Code-11-SP1-Branch/wagon: package/yast2-wagon.changes src/clients/wagon.ycp
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 12:40:31 2010 New Revision: 60867 URL: http://svn.opensuse.org/viewcvs/yast?rev=60867&view=rev Log: - Added macro-recording. Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Fri Feb 19 12:40:31 2010 @@ -4,6 +4,7 @@ - Disabling also repositories that provide installed products (as packages) but do not describe products in metadata (BNC #579905). - Cleanup before and after suse_register (BNC #580523). +- Added macro-recording. ------------------------------------------------------------------- Fri Feb 5 16:12:02 CET 2010 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp Fri Feb 19 12:40:31 2010 @@ -111,6 +111,9 @@ // Checks whether YaST has been restarted // Adjust step to start with void HandleInit () { + // logs what user does in UI + UI::RecordMacro (Directory::logdir + "/macro_online_migration.ycp"); + if (FileUtils::Exists (do_restart)) { y2milestone ("YaST has been restarted"); SCR::Execute (.target.remove, do_restart); -- 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] r60866 - in /branches/SuSE-Code-11-Branch/wagon: package/yast2-wagon.changes src/clients/wagon.ycp
by locilka＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: locilka Date: Fri Feb 19 12:40:20 2010 New Revision: 60866 URL: http://svn.opensuse.org/viewcvs/yast?rev=60866&view=rev Log: - Added macro-recording. Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Fri Feb 19 12:40:20 2010 @@ -4,6 +4,7 @@ - Disabling also repositories that provide installed products (as packages) but do not describe products in metadata (BNC #579905). - Cleanup before and after suse_register (BNC #580523). +- Added macro-recording. ------------------------------------------------------------------- Fri Feb 5 16:12:02 CET 2010 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp Fri Feb 19 12:40:20 2010 @@ -111,6 +111,9 @@ // Checks whether YaST has been restarted // Adjust step to start with void HandleInit () { + // logs what user does in UI + UI::RecordMacro (Directory::logdir + "/macro_online_migration.ycp"); + if (FileUtils::Exists (do_restart)) { y2milestone ("YaST has been restarted"); SCR::Execute (.target.remove, do_restart); -- 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] r60865 - in /trunk/autoinstallation: package/autoyast2.changes src/clients/inst_autosetup.ycp src/include/autopart.ycp
by ug＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: ug Date: Fri Feb 19 12:24:15 2010 New Revision: 60865 URL: http://svn.opensuse.org/viewcvs/yast?rev=60865&view=rev Log: imsmdriver config disbled and use of free space gained by resizing fixed (bnc#580842) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/inst_autosetup.ycp trunk/autoinstallation/src/include/autopart.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Feb 19 12:24:15 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 19 12:22:09 CET 2010 - ug(a)suse.de + +- imsmdriver config disbled (too late for that in the profile) +- use of free space gained by resizing fixed (bnc#580842) + +------------------------------------------------------------------- Thu Feb 18 10:11:31 CET 2010 - ug(a)suse.de - fetch_image.sh added Modified: trunk/autoinstallation/src/clients/inst_autosetup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autosetup.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autosetup.ycp Fri Feb 19 12:24:15 2010 @@ -219,13 +219,14 @@ // recognize this now Storage::ReReadTargetMap(); +/* too late for this Storage::SetImsmDriver( `IMSM_DMRAID ); foreach( map drive, Profile::current["partitioning"]:[], ``{ if( haskey( drive, "imsmdriver" ) ) { Storage::SetImsmDriver( drive["imsmdriver"]:`IMSM_DMRAID ); // bnc#574270 } }); - +*/ // No partitioning in the profile means yast2-storage proposal (hmmmm.....) if( size(Profile::current["partitioning"]:[]) > 0 ) { Modified: trunk/autoinstallation/src/include/autopart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/aut… ============================================================================== --- trunk/autoinstallation/src/include/autopart.ycp (original) +++ trunk/autoinstallation/src/include/autopart.ycp Fri Feb 19 12:24:15 2010 @@ -749,6 +749,16 @@ y2milestone( "requested partitions %1", ps ); y2milestone( "calculated gaps %1", g ); + ps = maplist( map partition, (list<map>)ps, ``{ + if( partition["resize"]:false ) { + // this is a cylinder correction for resized partitions + // bnc#580842 + partition["cylinders"] = partition["region",1]:0; + y2milestone("cylinder correction to %1", partition["cylinders"]:0); + } + return partition; + }); + foreach( map rp, (list<map>)ps, ``{ if( rp["resize"]:false ) { integer new_cyl_size = 0; @@ -768,7 +778,9 @@ y2milestone("partition resize cyl_size_change=%1",cyl_size_change); gap["cylinders"] = new_cyl_size; - gap["size"] = gap["size"]:0 + cyl_size_change * g["cyl_size"]:0; + //gap["size"] = gap["size"]:0 + cyl_size_change * g["cyl_size"]:0; + gap["size"] = new_cyl_size * g["cyl_size"]:0; + gap["end"] = gap["start"]:0 + new_cyl_size - 1; y2milestone("changing gap to %1",gap); } return gap; -- 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] r60864 - /trunk/autoinstallation/src/modules/AutoinstSoftware.ycp
by ug＠svn.opensuse.org 19 Feb '10

19 Feb '10

Author: ug Date: Fri Feb 19 11:09:47 2010 New Revision: 60864 URL: http://svn.opensuse.org/viewcvs/yast?rev=60864&view=rev Log: cleanup Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstSoftware.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Fri Feb 19 11:09:47 2010 @@ -202,6 +202,7 @@ string rootdir = (string)SCR::Read(.target.tmpdir); string zypperCall = ""; string outputRedirect = " 2>&1 >> /tmp/ay_image.log"; + boolean finalPopup = ( size(targetdir) == 0 ); image["script_location"] = image["script_location"]:"file:///usr/lib/YaST2/bin//fetch_image.sh"; image["script_params"] = image["script_params"]:[ image["image_location"]:""+"/"+image["image_name"]:"image"+".tar.gz" ]; @@ -209,8 +210,7 @@ // bind-mount devices SCR::Execute (.target.mkdir, rootdir+"/dev" ); - integer returnCode = (integer)SCR::Execute (.target.bash, sformat("touch /%1/dev/null", rootdir)); - returnCode = (integer)SCR::Execute (.target.bash, sformat("touch /%1/dev/zero", rootdir)); + integer returnCode = (integer)SCR::Execute (.target.bash, sformat("touch /%1/dev/null %1/dev/zero", rootdir)); returnCode = (integer)SCR::Execute (.target.bash, sformat("mount -o bind /dev/zero /%1/dev/zero", rootdir)); returnCode = (integer)SCR::Execute (.target.bash, sformat("mount -o bind /dev/null /%1/dev/null", rootdir)); @@ -251,7 +251,7 @@ if( size(PackageAI::toinstall) > 0 ) { string package = mergestring( PackageAI::toinstall, " "); Popup::ShowFeedback( _("Creating Image - installing packages"), ""); - returnCode = (integer)SCR::Execute (.target.bash, zypperCall+" " package + outputRedirect); + returnCode = (integer)SCR::Execute (.target.bash, zypperCall+" "+package + outputRedirect); Popup::ClearFeedback(); if( returnCode != 0 ) { Popup::Error( _("Image creation failed while package installation. Please check /tmp/ay_image.log") ); @@ -261,28 +261,28 @@ image_arch = GetArchOfELF( sformat("%1/bin/bash",rootdir) ); y2milestone("Image architecture = %1", image_arch); if( targetdir == "" ) { - Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") ); +// Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") ); targetdir = UI::AskForExistingDirectory ( "/", _("Store image to ...") ); } // umount devices - returnCode = (integer)SCR::Execute (.target.bash, sformat("umount /%1/dev/null", rootdir)); - returnCode = (integer)SCR::Execute (.target.bash, sformat("umount /%1/dev/zero", rootdir)); - returnCode = (integer)SCR::Execute (.target.bash, sformat("umount /%1/proc", rootdir)); - returnCode = (integer)SCR::Execute (.target.bash, sformat("rm -rf /%1/dev", rootdir)); + returnCode = (integer)SCR::Execute (.target.bash, sformat("umount %1/dev/null %1/dev/zero %1/proc", rootdir)); + returnCode = (integer)SCR::Execute (.target.bash, sformat("rm -rf %1/dev", rootdir)); // Compress image: // tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" . - string tarCommand = sformat("tar cfvz %4/%3.tar.gz --exclude=\"./proc*\" --exclude=\"/%3.tar.gz\" -C %1 . %2", rootdir, outputRedirect, image["image_name"]:"", targetdir); + string tarCommand = sformat("tar cfvz %4/%3.tar.gz --exclude=\"./proc*\" --exclude=\"/%3.tar.gz\" -C %1 . %2", + rootdir, outputRedirect, image["image_name"]:"", targetdir); y2milestone("running %1", tarCommand); - Popup::Message( sformat( _("You can do changes to the image now in %1.\nIf you press the ok-button, the image will be compressed and can't be changed anymore."), rootdir ) ); + Popup::Message( sformat( _("You can do changes to the image now in %1/\nIf you press the ok-button, the image will be compressed and can't be changed anymore."), rootdir ) ); Popup::ShowFeedback( "Compressing Image ...", "" ); returnCode = (integer)SCR::Execute (.target.bash, tarCommand); Popup::ClearFeedback(); if( returnCode != 0 ) { Popup::Error( sformat( _("Image compressing failed in '%1'. Please check /tmp/ay_image.log"), rootdir ) ); } - Popup::Message( _("Image created successfully") ); + if( finalPopup ) + Popup::Message( _("Image created successfully") ); } @@ -376,8 +376,11 @@ SCR::Write(.target.string, sformat("%1/boot/%2/loader/isolinux.cfg", isodir, image_arch), isolinuxcfg); // create the actual ISO file +// Popup::Message( _("Please choose a place where you want to save the ISO file in the next dialog") ); + string targetdir = UI::AskForExistingDirectory ( "/", _("Store ISO image to ...") ); Popup::ShowFeedback( _("Creating ISO File ..."), "" ); - string cmd = sformat("mkisofs -o /tmp/%1.iso -R -b boot/%3/loader/isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table %2",image["image_name"]:"",isodir, image_arch); + string cmd = sformat("mkisofs -o %1/%2.iso -R -b boot/%3/loader/isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table %4", + targetdir, image["image_name"]:"", image_arch, isodir); y2milestone("executing %1", cmd + outputRedirect); returnCode = (integer)SCR::Execute (.target.bash, cmd); Popup::ClearFeedback(); -- 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] r60863 - /branches/SuSE-Code-11-SP1-Branch/x11/
by jdsn＠svn.opensuse.org 18 Feb '10

18 Feb '10

Author: jdsn Date: Thu Feb 18 21:27:29 2010 New Revision: 60863 URL: http://svn.opensuse.org/viewcvs/yast?rev=60863&view=rev Log: proper svn ignores Modified: branches/SuSE-Code-11-SP1-Branch/x11/ (props changed) -- 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] r60862 - /tags/branch-Code-11-SP1-2_17_12/x11/
by jdsn＠svn.opensuse.org 18 Feb '10

18 Feb '10

Author: jdsn Date: Thu Feb 18 21:11:17 2010 New Revision: 60862 URL: http://svn.opensuse.org/viewcvs/yast?rev=60862&view=rev Log: Created tag branch-Code-11-SP1-2_17_12 for x11 Added: tags/branch-Code-11-SP1-2_17_12/x11/ (props changed) - copied from r60861, branches/SuSE-Code-11-SP1-Branch/x11/ -- 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] r60861 - in /branches/SuSE-Code-11-SP1-Branch/x11: VERSION package/yast2-x11.changes src/proposal/x11_proposal.ycp
by jdsn＠svn.opensuse.org 18 Feb '10

18 Feb '10

Author: jdsn Date: Thu Feb 18 21:11:11 2010 New Revision: 60861 URL: http://svn.opensuse.org/viewcvs/yast?rev=60861&view=rev Log: skip X configuration if framebuffer does not exist (bnc#565877) 2.17.12 Modified: branches/SuSE-Code-11-SP1-Branch/x11/VERSION branches/SuSE-Code-11-SP1-Branch/x11/package/yast2-x11.changes branches/SuSE-Code-11-SP1-Branch/x11/src/proposal/x11_proposal.ycp Modified: branches/SuSE-Code-11-SP1-Branch/x11/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/x11/V… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/x11/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/x11/VERSION Thu Feb 18 21:11:11 2010 @@ -1 +1 @@ -2.17.11 +2.17.12 Modified: branches/SuSE-Code-11-SP1-Branch/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/x11/p… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/x11/package/yast2-x11.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/x11/package/yast2-x11.changes Thu Feb 18 21:11:11 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 18 21:06:04 CET 2010 - jdsn(a)suse.de + +- skip X configuration if framebuffer does not exist (bnc#565877) +- 2.17.12 + +------------------------------------------------------------------- Mon Jan 26 17:22:15 CET 2009 - jdsn(a)suse.de - no X server start via display manager without a graphics Modified: branches/SuSE-Code-11-SP1-Branch/x11/src/proposal/x11_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/x11/s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/x11/src/proposal/x11_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/x11/src/proposal/x11_proposal.ycp Thu Feb 18 21:11:11 2010 @@ -55,7 +55,9 @@ y2milestone("No PCI device exists with ClassID 0300."); y2milestone("Now checking for a framebuffer device."); - if ( (integer)SCR::Execute(.target.bash, "[ -f /proc/fb ]") == 0 ) + // check if the framebuffer device exists AND if it has content (bnc#565877) + // newer kernels create it even if no framebuffer is available + if ( (integer)SCR::Execute(.target.bash, "[ -e /proc/fb ] && [ `wc -l /proc/fb | cut -d\" \" -f 1` -gt 0 ]") == 0 ) { y2milestone("Found a framebuffer device. X11 configuration will be perfomed."); } -- 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] r60860 - /tags/branch-Code-11-SP1-2_17_16/gtk/
by mkudlvasr＠svn.opensuse.org 18 Feb '10

18 Feb '10

Author: mkudlvasr Date: Thu Feb 18 18:51:35 2010 New Revision: 60860 URL: http://svn.opensuse.org/viewcvs/yast?rev=60860&view=rev Log: Created tag branch-Code-11-SP1-2_17_16 for gtk Added: tags/branch-Code-11-SP1-2_17_16/gtk/ (props changed) - copied from r60859, branches/SuSE-Code-11-SP1-Branch/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0