Author: rpmcruz
Date: Sat Aug 30 19:47:32 2008
New Revision: 50504
URL: http://svn.opensuse.org/viewcvs/yast?rev=50504&view=rev
Log:
* src/YGUtils.cc: stock exceptions for the media labels.
* src/YGDumbTab.cc: fixed tab shortcuts.
* src/YGRadioButton.cc & src/YGPackageSelector.cc: set border.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/YGDumbTab.cc
trunk/gtk/src/YGPackageSelector.cc
trunk/gtk/src/YGRadioButton.cc
trunk/gtk/src/YGWidget.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=50504&r1=50503&r2=50504&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Sat Aug 30 19:47:32 2008
@@ -2,6 +2,10 @@
* src/YGUtils.cc: stock exceptions for the media labels.
+ * src/YGDumbTab.cc: fixed tab shortcuts.
+
+ * src/YGRadioButton.cc & src/YGPackageSelector.cc: set border.
+
2008-08-29 Ricardo Cruz
* src/YGLayout.cc: implemented new libyui widget YButtonBox, making
Modified: trunk/gtk/src/YGDumbTab.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDumbTab.cc?rev=50504&r1=50503&r2=50504&view=diff
==============================================================================
--- trunk/gtk/src/YGDumbTab.cc (original)
+++ trunk/gtk/src/YGDumbTab.cc Sat Aug 30 19:47:32 2008
@@ -47,7 +47,6 @@
YDumbTab::addItem (item);
GtkWidget *tab_label, *image = 0, *label;
label = gtk_label_new (YGUtils::mapKBAccel (item->label()).c_str());
- gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
if (item->hasIconName()) {
string path = iconFullPath (item->iconName());
GdkPixbuf *pixbuf = YGUtils::loadPixbuf (path);
@@ -61,6 +60,9 @@
}
else
tab_label = label;
+ gchar *label_id = g_strdup_printf ("label-%d", item->index());
+ g_object_set_data (G_OBJECT (getWidget()), label_id, label);
+ g_free (label_id);
gtk_widget_show_all (tab_label);
GtkNotebook *notebook = GTK_NOTEBOOK (getWidget());
@@ -129,12 +131,16 @@
virtual void shortcutChanged()
{
- GtkNotebook *notebook = GTK_NOTEBOOK (getWidget());
for (YItemConstIterator it = itemsBegin(); it != itemsEnd(); it++) {
YItem *item = *it;
- GtkWidget *child = gtk_notebook_get_nth_page (notebook, item->index());
- std::string label = YGUtils::mapKBAccel (item->label());
- gtk_notebook_set_tab_label_text (notebook, child, label.c_str());
+ gchar *label_id = g_strdup_printf ("label-%d", item->index());
+ GtkWidget *label;
+ label = (GtkWidget *) g_object_get_data (G_OBJECT (getWidget()), label_id);
+ g_free (label_id);
+
+ std::string text = YGUtils::mapKBAccel (item->label());
+ gtk_label_set_text (GTK_LABEL (label), text.c_str());
+ gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
}
}
Modified: trunk/gtk/src/YGPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev=50504&r1=50503&r2=50504&view=diff
==============================================================================
--- trunk/gtk/src/YGPackageSelector.cc (original)
+++ trunk/gtk/src/YGPackageSelector.cc Sat Aug 30 19:47:32 2008
@@ -2432,7 +2432,6 @@
: YPackageSelector (NULL, mode),
YGWidget (this, parent, true, YGTK_TYPE_WIZARD, NULL)
{
- setBorder (0);
GtkWindow *window = YGDialog::currentWindow();
int enlarge_width = MIN (0.95 * YUI::app()->displayWidth(), 650);
int enlarge_height = MIN (0.95 * YUI::app()->displayHeight(), 600);
Modified: trunk/gtk/src/YGRadioButton.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGRadioButton.cc?rev=50504&r1=50503&r2=50504&view=diff
==============================================================================
--- trunk/gtk/src/YGRadioButton.cc (original)
+++ trunk/gtk/src/YGRadioButton.cc Sat Aug 30 19:47:32 2008
@@ -52,7 +52,6 @@
YGWidget (this, parent, true, getCheckRadioButtonType(), NULL)
{
IMPL
- setBorder (0);
if (!is_horizontal_box (parent))
setStretchable (YD_HORIZ, true);
setLabel (label);
@@ -127,7 +126,9 @@
YGRadioButtonGroup(YWidget *parent)
: YRadioButtonGroup (NULL),
YGWidget (this, parent, true, GTK_TYPE_EVENT_BOX, NULL)
- {}
+ {
+ setBorder (0);
+ }
YGWIDGET_IMPL_COMMON
YGWIDGET_IMPL_CHILD_ADDED (m_widget)
@@ -151,7 +152,6 @@
YGWidget (this, parent, true, GTK_TYPE_CHECK_BUTTON, NULL)
{
IMPL
- setBorder (0);
if (!is_horizontal_box (parent))
setStretchable (YD_HORIZ, true);
setLabel (label);
Modified: trunk/gtk/src/YGWidget.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWidget.cc?rev=50504&r1=50503&r2=50504&view=diff
==============================================================================
--- trunk/gtk/src/YGWidget.cc (original)
+++ trunk/gtk/src/YGWidget.cc Sat Aug 30 19:47:32 2008
@@ -239,13 +239,13 @@
gtk_widget_hide (m_label);
else {
gtk_widget_show (m_label);
-/*
+
// add a ':' at the end
int last = str.length()-1;
if (str [last] != ':' && str [last] != '.' && str [last] != ' ')
str += ':';
- // set it as upper case
+/* // set it as upper case
unsigned int first = (str [0] == '_') ? 1 : 0;
if (str [first] >= 'a' && str [first] <= 'z')
str [first] += 'A' - 'a';
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
rpmcruz＠svn.opensuse.org