YaST Commits July 2010

yast-commit@lists.opensuse.org

17 participants
156 discussions

[yast-commit] r62248 - /trunk/gtk/src/YGPushButton.cc
by rpmcruz＠svn.opensuse.org 14 Jul '10

14 Jul '10

Author: rpmcruz Date: Wed Jul 14 12:59:23 2010 New Revision: 62248 URL: http://svn.opensuse.org/viewcvs/yast?rev=62248&view=rev Log: Force show icon for explicitely set icons. Modified: trunk/gtk/src/YGPushButton.cc Modified: trunk/gtk/src/YGPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPushButton.cc?rev=6224… ============================================================================== --- trunk/gtk/src/YGPushButton.cc (original) +++ trunk/gtk/src/YGPushButton.cc Wed Jul 14 12:59:23 2010 @@ -96,7 +96,7 @@ GtkButton *button = GTK_BUTTON (getWidget()); if (icon.empty()) { m_customIcon = false; - // no need to worry about freeing the image, let it live with button + // can't remove image; just hide it GtkWidget *image = gtk_button_get_image (button); if (image) gtk_widget_hide (image); @@ -112,6 +112,8 @@ if (pixbuf) { GtkWidget *image = gtk_image_new_from_pixbuf (pixbuf); gtk_button_set_image (button, image); + // disregard gtk-button-images setting for explicitly set icons + gtk_widget_show (image); g_object_unref (G_OBJECT (pixbuf)); } else -- 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] r62247 - in /trunk/gtk: ChangeLog src/YGDialog.cc src/YGDialog.h src/YGPackageSelectorPluginStub.cc src/YGUI.cc src/YGUI.h src/pkg/YGPackageSelector.cc src/pkg/ygtkpkgdetailview.cc
by rpmcruz＠svn.opensuse.org 14 Jul '10

14 Jul '10

Author: rpmcruz Date: Wed Jul 14 12:57:59 2010 New Revision: 62247 URL: http://svn.opensuse.org/viewcvs/yast?rev=62247&view=rev Log: Undo reverse. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc trunk/gtk/src/YGDialog.h trunk/gtk/src/YGPackageSelectorPluginStub.cc trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUI.h trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkpkgdetailview.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62247&r1=62246… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Jul 14 12:57:59 2010 @@ -1,5 +1,9 @@ 2010-07-14 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + * Undone reversion. + +2010-07-14 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + * Reversed some of previous changes for build service process. Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=62247&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Wed Jul 14 12:57:59 2010 @@ -23,9 +23,6 @@ be a YGDialog and is swap-able. */ -#define DEFAULT_WIDTH 750 -#define DEFAULT_HEIGHT 650 - class YGWindow; static YGWindow *main_window = 0; @@ -93,7 +90,19 @@ } if (_main_window) { - int width = DEFAULT_WIDTH, height = DEFAULT_HEIGHT; + static int width = 0, height; + if (!width) { + int char_width = YGUtils::getCharsWidth (m_widget, 1); + + fprintf (stderr, "char width: %d\n", char_width); + if (char_width < 7) + { width = 750; height = 650; } + else + { width = 800; height = 750; } + if (YGUI::ui()->isPkgSelector()) + height = width; + } + if (YGUI::ui()->defaultWidth()) width = YGUI::ui()->defaultWidth(); if (YGUI::ui()->defaultHeight()) @@ -355,7 +364,7 @@ m_window->setChild (this); } -void YGDialog::present() +void YGDialog::blink() { GtkWindow *window = GTK_WINDOW (m_window->getWidget()); if (!gtk_window_is_active (window)) @@ -429,16 +438,6 @@ } } -void YGDialog::setMinSize (int width, int height) -{ - GtkWidget *window = m_window->getWidget(); - width = MIN (width, YUI::app()->displayWidth()); - height = MIN (height, YUI::app()->displayHeight()); - width = MAX (width, window->allocation.width), - height = MAX (height, window->allocation.height); - gtk_window_resize (GTK_WINDOW (window), width, height); -} - void YGDialog::highlight (YWidget *ywidget) { struct inner { @@ -520,7 +519,7 @@ g_free (str); m_stickyTitle = sticky; } - present(); + blink(); } extern "C" { Modified: trunk/gtk/src/YGDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.h?rev=62247&r1=… ============================================================================== --- trunk/gtk/src/YGDialog.h (original) +++ trunk/gtk/src/YGDialog.h Wed Jul 14 12:57:59 2010 @@ -35,11 +35,10 @@ static GtkWindow *currentWindow(); virtual void doSetSize (int width, int height); - void setMinSize (int width, int height); // used internally by YGPackageSelector.cc virtual void openInternal(); virtual void activate(); - void present(); + void blink(); virtual YEvent *waitForEventInternal (int timeout_millisec); virtual YEvent *pollEventInternal(); Modified: trunk/gtk/src/YGPackageSelectorPluginStub.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelectorPluginS… ============================================================================== --- trunk/gtk/src/YGPackageSelectorPluginStub.cc (original) +++ trunk/gtk/src/YGPackageSelectorPluginStub.cc Wed Jul 14 12:57:59 2010 @@ -11,12 +11,6 @@ #include <YEvent.h> #include <string.h> -bool YGUI::pkgSelectorParse (const char *arg) -{ return false; } - -void YGUI::pkgSelectorSize (int *width, int *height) -{ *width = 750; *height = 750; } - class YGPackageSelectorPluginStub : public YPackageSelectorPlugin { YGPackageSelectorPluginIf *impl; Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=62247&r1=622… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Wed Jul 14 12:57:59 2010 @@ -118,7 +118,7 @@ const char *argp = argv[i]; if (argp[0] != '-') { if (!strcmp (argp, "sw_single") || !strcmp (argp, "online_update")) - YGUI::pkgSelectorSize (&m_default_width, &m_default_height); + m_swsingle = true; continue; } argp++; @@ -143,7 +143,6 @@ )); exit (0); } - else if (pkgSelectorParse (argp)) ; } gtk_init (&argc, &argv); Modified: trunk/gtk/src/YGUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.h?rev=62247&r1=6224… ============================================================================== --- trunk/gtk/src/YGUI.h (original) +++ trunk/gtk/src/YGUI.h Wed Jul 14 12:57:59 2010 @@ -63,20 +63,17 @@ static gboolean busy_timeout_cb (gpointer data); // window-related arguments - bool m_have_wm, m_no_border, m_fullscreen; + bool m_have_wm, m_no_border, m_fullscreen, m_swsingle; int m_default_width, m_default_height; - bool pkgSelectorParse (const char *arg); - public: - void pkgSelectorSize (int *width, int *height); - // Helpers for internal use [ visibility hidden ] bool setFullscreen() const { return m_fullscreen; } bool hasWM() const { return m_have_wm; } bool unsetBorder() const { return m_no_border; } int defaultWidth() const { return m_default_width; } - int defaultHeight() const { return m_default_height; } + int defaultHeight() const { return m_default_height; } + bool isPkgSelector() const { return m_swsingle; } }; // debug helpers. 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 Wed Jul 14 12:57:59 2010 @@ -177,10 +177,14 @@ status->select (3); m_queryWidgets.push_back (status); + GtkWidget *vpaned = gtk_vpaned_new(); gtk_paned_pack1 (GTK_PANED (vpaned), m_combo->getWidget(), TRUE, FALSE); gtk_paned_pack2 (GTK_PANED (vpaned), status->getWidget(), FALSE, FALSE); - gtk_paned_set_position (GTK_PANED (vpaned), 485); + if (YGUtils::getCharsWidth (vpaned, 1) < 7) + gtk_paned_set_position (GTK_PANED (vpaned), 485); + else + gtk_paned_set_position (GTK_PANED (vpaned), 500); return vpaned; } @@ -193,7 +197,10 @@ GtkWidget *hpaned = gtk_hpaned_new(); gtk_paned_pack1 (GTK_PANED (hpaned), createSidebar(), FALSE, TRUE); gtk_paned_pack2 (GTK_PANED (hpaned), createMainArea(), TRUE, FALSE); - gtk_paned_set_position (GTK_PANED (hpaned), 200); + if (YGUtils::getCharsWidth (hpaned, 1) < 7) + gtk_paned_set_position (GTK_PANED (hpaned), 200); + else + gtk_paned_set_position (GTK_PANED (hpaned), 230); m_widget = gtk_vbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (m_widget), hpaned, TRUE, TRUE, 0); @@ -577,7 +584,8 @@ static void vpaned_allocate_cb (GtkWidget *vpaned, GtkAllocation *alloc, Impl *pThis) { if (!g_object_get_data (G_OBJECT (vpaned), "init")) { // only once - int pos = MAX (alloc->height / 2, alloc->height - 180); + int height = (YGUtils::getCharsWidth (vpaned, 1) < 7) ? 180 : 220; + int pos = MAX (alloc->height / 2, alloc->height - height); gtk_paned_set_position (GTK_PANED (vpaned), pos); g_object_set_data (G_OBJECT (vpaned), "init", GINT_TO_POINTER (1)); } @@ -668,9 +676,6 @@ setBorder (0); YGDialog *dialog = YGDialog::currentDialog(); dialog->setCloseCallback (confirm_cb, this); - int width, height; - YGUI::ui()->pkgSelectorSize (&width, &height); - dialog->setMinSize (width, height); const char *icon, *title, **help; if (onlineUpdateMode()) { 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 Wed Jul 14 12:57:59 2010 @@ -339,16 +339,16 @@ ZyppPackage zpkg = castZyppPackage (zobj); std::string str; - std::string b (""), _b (" "), br (" "); + std::string b (""), _b (" "), i (""), _i(""), br (" "); str.reserve (2048); - str += b + _("Size:") + _b + zobj->installSize().asString(); - str += br + b + _("License:") + _b + zpkg->license(); + str += b + _("Size:") + _b + i + zobj->installSize().asString() + _i; + str += br + b + _("License:") + _b + i + zpkg->license() + _i; if (zsel->hasInstalledObj()) - str += br + b + ("Installed at:") + _b + - zsel->installedObj()->installtime().form ("%x"); + str += br + b + ("Installed at:") + _b + i + + zsel->installedObj()->installtime().form ("%x") + _i; if (zsel->hasCandidateObj()) - str += br + b + ("Latest build:") + _b + - zsel->candidateObj()->buildtime().form ("%x"); + str += br + b + ("Latest build:") + _b + i + + zsel->candidateObj()->buildtime().form ("%x") + _i; ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str()); } @@ -720,6 +720,8 @@ ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), ("" + col1 + "").c_str()); gtk_box_pack_start (GTK_BOX (hbox), col, FALSE, TRUE, 0); + // by settings both the two following "col" text widgets with the same + // fixed width, and expanded=True, we ensure all rows have the same size col = ygtk_rich_text_new(); gtk_widget_set_size_request (col, 80, -1); ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), col2.c_str()); @@ -758,10 +760,8 @@ Ypp::Selectable sel = list.get (0); clear(); - std::string installed_str (_("Installed Version")); - std::string candidate_str (_("Candidate Version")); - installed_str = "" + installed_str + ""; - candidate_str = "" + candidate_str + ""; + std::string installed_str (_("Installed Version")); + std::string candidate_str (_("Available Version")); if (sel.hasInstalledVersion()) installed_str += " " + sel.installed().number(); if (sel.hasCandidateVersion()) @@ -1052,7 +1052,7 @@ Ypp::Selectable sel = list.get (0); std::string str (authors (sel)); if (str.empty()) - ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), _("Unspecified attribute.")); + ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), _("Not specified.")); else ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str()); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62246 - /branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc
by rpmcruz＠svn.opensuse.org 14 Jul '10

14 Jul '10

Author: rpmcruz Date: Wed Jul 14 12:57:02 2010 New Revision: 62246 URL: http://svn.opensuse.org/viewcvs/yast?rev=62246&view=rev Log: Trunk. Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc Wed Jul 14 12:57:02 2010 @@ -154,15 +154,15 @@ Ypp::Package pkg (sel); std::string url (pkg.url()); if (!url.empty()) { - str += ""; str += _("Web site:"); - str += " <a href=\""; str += url; str += "\">"; + str += ""; str += _("Web site:"); + str += " <a href=\""; str += url; str += "\">"; str += url; str += "</a>"; } if (pkg.isCandidatePatch()) { Ypp::Selectable _patch = pkg.getCandidatePatch(); Ypp::Patch patch (_patch); - str += ""; str += _("Patch issued:"); - str += " "; str += _patch.summary(); + str += ""; str += _("Patch issued:"); + str += " "; str += _patch.summary(); str += " ("; str += Ypp::Patch::prioritySummary (patch.priority()); str += ")"; str += ""; @@ -339,7 +339,7 @@ ZyppPackage zpkg = castZyppPackage (zobj); std::string str; - std::string b (""), _b (" "), br (" "); + std::string b (""), _b (" "), br (" "); str.reserve (2048); str += b + _("Size:") + _b + zobj->installSize().asString(); str += br + b + _("License:") + _b + zpkg->license(); @@ -718,10 +718,10 @@ col = ygtk_rich_text_new(); gtk_widget_set_size_request (col, 100, -1); ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), - ("" + col1 + "").c_str()); + ("" + col1 + "").c_str()); gtk_box_pack_start (GTK_BOX (hbox), col, FALSE, TRUE, 0); col = ygtk_rich_text_new(); - gtk_widget_set_size_request (col, 1, -1); + gtk_widget_set_size_request (col, 80, -1); ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), col2.c_str()); if (dep == 0) g_signal_connect (G_OBJECT (col), "link-clicked", @@ -731,7 +731,7 @@ G_CALLBACK (provides_link_cb), NULL); gtk_box_pack_start (GTK_BOX (hbox), col, TRUE, TRUE, 0); col = ygtk_rich_text_new(); - gtk_widget_set_size_request (col, 1, -1); + gtk_widget_set_size_request (col, 80, -1); ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), col3.c_str()); if (dep == 0) g_signal_connect (G_OBJECT (col), "link-clicked", @@ -759,7 +759,9 @@ clear(); std::string installed_str (_("Installed Version")); - std::string candidate_str (_("Available Version")); + std::string candidate_str (_("Candidate Version")); + installed_str = "" + installed_str + ""; + candidate_str = "" + candidate_str + ""; if (sel.hasInstalledVersion()) installed_str += " " + sel.installed().number(); if (sel.hasCandidateVersion()) @@ -1026,7 +1028,7 @@ YGUtils::replace (changes, "\n", 1, " "); if (author.compare (0, 2, "- ", 2) == 0) // zypp returns a lot of author strings as author.erase (0, 2); // "- author". wtf? - text += date + " (" + author + "): <blockquote>" + changes + "</blockquote>"; + text += "" + date + " (" + author + "): <blockquote>" + changes + "</blockquote>"; } } return text; @@ -1050,7 +1052,7 @@ Ypp::Selectable sel = list.get (0); std::string str (authors (sel)); if (str.empty()) - ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), _("Not specified.")); + ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), _("Unspecified attribute.")); else ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str()); } @@ -1102,9 +1104,10 @@ } if (!authors.empty()) { - text = _("Developed by:") + ("<blockquote>" + authors) + "</blockquote>"; + text = ""; text += _("Developed by:"); text += ""; + text += ("<blockquote>" + authors) + "</blockquote>"; if (!packager.empty() || !vendor.empty()) { - text += _("Packaged by:"); + text += ""; text += _("Packaged by:"); text += ""; text += "<blockquote>"; if (!packager.empty()) text += packager + " "; if (!vendor.empty()) text += "(" + vendor + ")"; -- 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] r62245 - /tags/stable-2_21_67/gtk/
by rpmcruz＠svn.opensuse.org 14 Jul '10

14 Jul '10

Author: rpmcruz Date: Wed Jul 14 12:42:22 2010 New Revision: 62245 URL: http://svn.opensuse.org/viewcvs/yast?rev=62245&view=rev Log: Created tag stable-2_21_67 for gtk Added: tags/stable-2_21_67/gtk/ - copied from r62244, 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] r62244 - /tags/stable-2_21_67/
by rpmcruz＠svn.opensuse.org 14 Jul '10

14 Jul '10

Author: rpmcruz Date: Wed Jul 14 12:42:16 2010 New Revision: 62244 URL: http://svn.opensuse.org/viewcvs/yast?rev=62244&view=rev Log: Created tag stable-2_21_67 Added: tags/stable-2_21_67/ -- 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] r62243 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 14 Jul '10

14 Jul '10

Author: rpmcruz Date: Wed Jul 14 12:42:13 2010 New Revision: 62243 URL: http://svn.opensuse.org/viewcvs/yast?rev=62243&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=62243&r1=62242&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Wed Jul 14 12:42:13 2010 @@ -1 +1 @@ -2.21.66 +2.21.67 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62243&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Wed Jul 14 12:42:13 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "66") +SET(VERSION_PATCH "67") 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 Wed Jul 14 12:42:13 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 14 11:41:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.67 +- build for bnc#620513 patch. + +------------------------------------------------------------------- Tue Jul 13 16:04:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.66 -- 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] r62242 - in /trunk/gtk: ChangeLog src/YGDialog.cc src/YGDialog.h src/YGPackageSelectorPluginStub.cc src/YGUI.cc src/YGUI.h src/pkg/YGPackageSelector.cc src/pkg/ygtkpkgdetailview.cc
by rpmcruz＠svn.opensuse.org 14 Jul '10

14 Jul '10

Author: rpmcruz Date: Wed Jul 14 12:40:53 2010 New Revision: 62242 URL: http://svn.opensuse.org/viewcvs/yast?rev=62242&view=rev Log: * Reversed some of previous changes for build service process. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc trunk/gtk/src/YGDialog.h trunk/gtk/src/YGPackageSelectorPluginStub.cc trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUI.h trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkpkgdetailview.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62242&r1=62241… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Jul 14 12:40:53 2010 @@ -1,3 +1,8 @@ +2010-07-14 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * Reversed some of previous changes for build service + process. + 2010-07-13 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGDialog.cc & src/pkg/YGPackageSelector.cc: as Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=62242&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Wed Jul 14 12:40:53 2010 @@ -23,6 +23,9 @@ be a YGDialog and is swap-able. */ +#define DEFAULT_WIDTH 750 +#define DEFAULT_HEIGHT 650 + class YGWindow; static YGWindow *main_window = 0; @@ -90,19 +93,7 @@ } if (_main_window) { - static int width = 0, height; - if (!width) { - int char_width = YGUtils::getCharsWidth (m_widget, 1); - - fprintf (stderr, "char width: %d\n", char_width); - if (char_width < 7) - { width = 750; height = 650; } - else - { width = 800; height = 750; } - if (YGUI::ui()->isPkgSelector()) - height = width; - } - + int width = DEFAULT_WIDTH, height = DEFAULT_HEIGHT; if (YGUI::ui()->defaultWidth()) width = YGUI::ui()->defaultWidth(); if (YGUI::ui()->defaultHeight()) @@ -364,7 +355,7 @@ m_window->setChild (this); } -void YGDialog::blink() +void YGDialog::present() { GtkWindow *window = GTK_WINDOW (m_window->getWidget()); if (!gtk_window_is_active (window)) @@ -438,6 +429,16 @@ } } +void YGDialog::setMinSize (int width, int height) +{ + GtkWidget *window = m_window->getWidget(); + width = MIN (width, YUI::app()->displayWidth()); + height = MIN (height, YUI::app()->displayHeight()); + width = MAX (width, window->allocation.width), + height = MAX (height, window->allocation.height); + gtk_window_resize (GTK_WINDOW (window), width, height); +} + void YGDialog::highlight (YWidget *ywidget) { struct inner { @@ -519,7 +520,7 @@ g_free (str); m_stickyTitle = sticky; } - blink(); + present(); } extern "C" { Modified: trunk/gtk/src/YGDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.h?rev=62242&r1=… ============================================================================== --- trunk/gtk/src/YGDialog.h (original) +++ trunk/gtk/src/YGDialog.h Wed Jul 14 12:40:53 2010 @@ -35,10 +35,11 @@ static GtkWindow *currentWindow(); virtual void doSetSize (int width, int height); + void setMinSize (int width, int height); // used internally by YGPackageSelector.cc virtual void openInternal(); virtual void activate(); - void blink(); + void present(); virtual YEvent *waitForEventInternal (int timeout_millisec); virtual YEvent *pollEventInternal(); Modified: trunk/gtk/src/YGPackageSelectorPluginStub.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelectorPluginS… ============================================================================== --- trunk/gtk/src/YGPackageSelectorPluginStub.cc (original) +++ trunk/gtk/src/YGPackageSelectorPluginStub.cc Wed Jul 14 12:40:53 2010 @@ -11,6 +11,12 @@ #include <YEvent.h> #include <string.h> +bool YGUI::pkgSelectorParse (const char *arg) +{ return false; } + +void YGUI::pkgSelectorSize (int *width, int *height) +{ *width = 750; *height = 750; } + class YGPackageSelectorPluginStub : public YPackageSelectorPlugin { YGPackageSelectorPluginIf *impl; Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=62242&r1=622… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Wed Jul 14 12:40:53 2010 @@ -118,7 +118,7 @@ const char *argp = argv[i]; if (argp[0] != '-') { if (!strcmp (argp, "sw_single") || !strcmp (argp, "online_update")) - m_swsingle = true; + YGUI::pkgSelectorSize (&m_default_width, &m_default_height); continue; } argp++; @@ -143,6 +143,7 @@ )); exit (0); } + else if (pkgSelectorParse (argp)) ; } gtk_init (&argc, &argv); Modified: trunk/gtk/src/YGUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.h?rev=62242&r1=6224… ============================================================================== --- trunk/gtk/src/YGUI.h (original) +++ trunk/gtk/src/YGUI.h Wed Jul 14 12:40:53 2010 @@ -63,17 +63,20 @@ static gboolean busy_timeout_cb (gpointer data); // window-related arguments - bool m_have_wm, m_no_border, m_fullscreen, m_swsingle; + bool m_have_wm, m_no_border, m_fullscreen; int m_default_width, m_default_height; + bool pkgSelectorParse (const char *arg); + public: + void pkgSelectorSize (int *width, int *height); + // Helpers for internal use [ visibility hidden ] bool setFullscreen() const { return m_fullscreen; } bool hasWM() const { return m_have_wm; } bool unsetBorder() const { return m_no_border; } int defaultWidth() const { return m_default_width; } - int defaultHeight() const { return m_default_height; } - bool isPkgSelector() const { return m_swsingle; } + int defaultHeight() const { return m_default_height; } }; // debug helpers. 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 Wed Jul 14 12:40:53 2010 @@ -177,14 +177,10 @@ status->select (3); m_queryWidgets.push_back (status); - GtkWidget *vpaned = gtk_vpaned_new(); gtk_paned_pack1 (GTK_PANED (vpaned), m_combo->getWidget(), TRUE, FALSE); gtk_paned_pack2 (GTK_PANED (vpaned), status->getWidget(), FALSE, FALSE); - if (YGUtils::getCharsWidth (vpaned, 1) < 7) - gtk_paned_set_position (GTK_PANED (vpaned), 485); - else - gtk_paned_set_position (GTK_PANED (vpaned), 500); + gtk_paned_set_position (GTK_PANED (vpaned), 485); return vpaned; } @@ -197,10 +193,7 @@ GtkWidget *hpaned = gtk_hpaned_new(); gtk_paned_pack1 (GTK_PANED (hpaned), createSidebar(), FALSE, TRUE); gtk_paned_pack2 (GTK_PANED (hpaned), createMainArea(), TRUE, FALSE); - if (YGUtils::getCharsWidth (hpaned, 1) < 7) - gtk_paned_set_position (GTK_PANED (hpaned), 200); - else - gtk_paned_set_position (GTK_PANED (hpaned), 230); + gtk_paned_set_position (GTK_PANED (hpaned), 200); m_widget = gtk_vbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (m_widget), hpaned, TRUE, TRUE, 0); @@ -584,8 +577,7 @@ static void vpaned_allocate_cb (GtkWidget *vpaned, GtkAllocation *alloc, Impl *pThis) { if (!g_object_get_data (G_OBJECT (vpaned), "init")) { // only once - int height = (YGUtils::getCharsWidth (vpaned, 1) < 7) ? 180 : 220; - int pos = MAX (alloc->height / 2, alloc->height - height); + int pos = MAX (alloc->height / 2, alloc->height - 180); gtk_paned_set_position (GTK_PANED (vpaned), pos); g_object_set_data (G_OBJECT (vpaned), "init", GINT_TO_POINTER (1)); } @@ -676,6 +668,9 @@ setBorder (0); YGDialog *dialog = YGDialog::currentDialog(); dialog->setCloseCallback (confirm_cb, this); + int width, height; + YGUI::ui()->pkgSelectorSize (&width, &height); + dialog->setMinSize (width, height); const char *icon, *title, **help; if (onlineUpdateMode()) { 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 Wed Jul 14 12:40:53 2010 @@ -339,16 +339,16 @@ ZyppPackage zpkg = castZyppPackage (zobj); std::string str; - std::string b (""), _b (" "), i (""), _i(""), br (" "); + std::string b (""), _b (" "), br (" "); str.reserve (2048); - str += b + _("Size:") + _b + i + zobj->installSize().asString() + _i; - str += br + b + _("License:") + _b + i + zpkg->license() + _i; + str += b + _("Size:") + _b + zobj->installSize().asString(); + str += br + b + _("License:") + _b + zpkg->license(); if (zsel->hasInstalledObj()) - str += br + b + ("Installed at:") + _b + i + - zsel->installedObj()->installtime().form ("%x") + _i; + str += br + b + ("Installed at:") + _b + + zsel->installedObj()->installtime().form ("%x"); if (zsel->hasCandidateObj()) - str += br + b + ("Latest build:") + _b + i + - zsel->candidateObj()->buildtime().form ("%x") + _i; + str += br + b + ("Latest build:") + _b + + zsel->candidateObj()->buildtime().form ("%x"); ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str()); } @@ -720,8 +720,6 @@ ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), ("" + col1 + "").c_str()); gtk_box_pack_start (GTK_BOX (hbox), col, FALSE, TRUE, 0); - // by settings both the two following "col" text widgets with the same - // fixed width, and expanded=True, we ensure all rows have the same size col = ygtk_rich_text_new(); gtk_widget_set_size_request (col, 80, -1); ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), col2.c_str()); @@ -760,8 +758,10 @@ Ypp::Selectable sel = list.get (0); clear(); - std::string installed_str (_("Installed Version")); - std::string candidate_str (_("Available Version")); + std::string installed_str (_("Installed Version")); + std::string candidate_str (_("Candidate Version")); + installed_str = "" + installed_str + ""; + candidate_str = "" + candidate_str + ""; if (sel.hasInstalledVersion()) installed_str += " " + sel.installed().number(); if (sel.hasCandidateVersion()) @@ -1052,7 +1052,7 @@ Ypp::Selectable sel = list.get (0); std::string str (authors (sel)); if (str.empty()) - ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), _("Not specified.")); + ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), _("Unspecified attribute.")); else ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str()); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62241 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-dialogs.ycp
by aschnell＠svn.opensuse.org 14 Jul '10

14 Jul '10

Author: aschnell Date: Wed Jul 14 10:14:39 2010 New Revision: 62241 URL: http://svn.opensuse.org/viewcvs/yast?rev=62241&view=rev Log: - improved help text (bnc #506814) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-dialogs.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Jul 14 10:14:39 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jul 14 10:12:46 CEST 2010 - aschnell(a)suse.de + +- improved help text (bnc #506814) + +------------------------------------------------------------------- Wed Jul 07 12:51:11 CEST 2010 - aschnell(a)suse.de - improved layout of dialog for importing mount points Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Wed Jul 14 10:14:39 2010 @@ -20,7 +20,8 @@ formatted and the desired file system type."); // helptext - helptext = helptext + _("Changing the encryption on an existing + helptext = helptext + _("If you want to encrypt all data on the +volume select Encrypt device. Changing the encryption on an existing volume will delete all data on it."); // helptext -- 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] r62240 - /tags/stable-2_21_66/gtk/
by rpmcruz＠svn.opensuse.org 13 Jul '10

13 Jul '10

Author: rpmcruz Date: Tue Jul 13 17:05:21 2010 New Revision: 62240 URL: http://svn.opensuse.org/viewcvs/yast?rev=62240&view=rev Log: Created tag stable-2_21_66 for gtk Added: tags/stable-2_21_66/gtk/ - copied from r62239, 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] r62239 - /tags/stable-2_21_66/
by rpmcruz＠svn.opensuse.org 13 Jul '10

13 Jul '10

Author: rpmcruz Date: Tue Jul 13 17:05:15 2010 New Revision: 62239 URL: http://svn.opensuse.org/viewcvs/yast?rev=62239&view=rev Log: Created tag stable-2_21_66 Added: tags/stable-2_21_66/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
16
Older →

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

YaST Commits July 2010