November 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r53687 - /trunk/storage/storage/src/include/custom_part_check_generated.ycp
by aschnell＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: aschnell Date: Fri Nov 28 11:17:05 2008 New Revision: 53687 URL: http://svn.opensuse.org/viewcvs/yast?rev=53687&view=rev Log: - fixed milestone Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Fri Nov 28 11:17:05 2008 @@ -47,7 +47,7 @@ boolean check_created_partition_table(const map<string,map> targetMap, boolean installation) { - y2milestone("now checking generated target map installation:%2", installation); + y2milestone("now checking generated target map installation:%1", installation); boolean show_all_popups = false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r53686 - /tags/stable-2_17_14/update/
by locilka＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: locilka Date: Fri Nov 28 10:59:20 2008 New Revision: 53686 URL: http://svn.opensuse.org/viewcvs/yast?rev=53686&view=rev Log: Created tag stable-2_17_14 for update Added: tags/stable-2_17_14/update/ - copied from r53685, trunk/update/ -- 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] r53685 - in /trunk/update: VERSION package/yast2-update.changes src/modules/RootPart.ycp
by locilka＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: locilka Date: Fri Nov 28 10:55:23 2008 New Revision: 53685 URL: http://svn.opensuse.org/viewcvs/yast?rev=53685&view=rev Log: - Checking spec for /var partition if it is a persisten device name (bnc #448577). - 2.17.14 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/modules/RootPart.ycp Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=53685&r1=5368… ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Fri Nov 28 10:55:23 2008 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Fri Nov 28 10:55:23 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 28 10:52:15 CET 2008 - locilka(a)suse.cz + +- Checking spec for /var partition if it is a persisten device + name (bnc #448577). +- 2.17.14 + +------------------------------------------------------------------- Thu Nov 20 14:05:59 CET 2008 - aschnell(a)suse.de - added warning for use of kernel device names in /etc/fstab Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?… ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Fri Nov 28 10:55:23 2008 @@ -1211,7 +1211,8 @@ list <string> realdisks = []; foreach (string s, map m, (map <string, map>) Storage::GetOndiskTarget (), { - if (Storage::DeviceRealDisk (s)) + // BNC #448577, checking device + if (Storage::IsKernelDeviceName(s) && Storage::DeviceRealDisk (s)) realdisks = add (realdisks, s); }); -- 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] r53684 - /tags/stable-2_17_14/kdump/
by juhliarik＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: juhliarik Date: Fri Nov 28 10:44:04 2008 New Revision: 53684 URL: http://svn.opensuse.org/viewcvs/yast?rev=53684&view=rev Log: Created tag stable-2_17_14 for kdump Added: tags/stable-2_17_14/kdump/ - copied from r53683, trunk/kdump/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r53683 - in /trunk/kdump: VERSION package/yast2-kdump.changes
by juhliarik＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: juhliarik Date: Fri Nov 28 10:43:54 2008 New Revision: 53683 URL: http://svn.opensuse.org/viewcvs/yast?rev=53683&view=rev Log: new package Modified: trunk/kdump/VERSION trunk/kdump/package/yast2-kdump.changes Modified: trunk/kdump/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/VERSION?rev=53683&r1=53682… ============================================================================== --- trunk/kdump/VERSION (original) +++ trunk/kdump/VERSION Fri Nov 28 10:43:54 2008 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: trunk/kdump/package/yast2-kdump.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/package/yast2-kdump.change… ============================================================================== --- trunk/kdump/package/yast2-kdump.changes (original) +++ trunk/kdump/package/yast2-kdump.changes Fri Nov 28 10:43:54 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 28 10:13:57 CET 2008 - juhliarik(a)suse.cz + +- updated proposal of alocation memory (bnc #446480) +- V 2.17.14 + +------------------------------------------------------------------- Thu Nov 20 15:51:15 CET 2008 - juhliarik(a)suse.cz - deleted offset for ppc64 in crashkernel value (bnc #447107) -- 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] r53682 - /trunk/kdump/src/Kdump.ycp
by juhliarik＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: juhliarik Date: Fri Nov 28 10:13:53 2008 New Revision: 53682 URL: http://svn.opensuse.org/viewcvs/yast?rev=53682&view=rev Log: updated proposal for alocation memory Modified: trunk/kdump/src/Kdump.ycp Modified: trunk/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/Kdump.ycp?rev=53682&r1… ============================================================================== --- trunk/kdump/src/Kdump.ycp (original) +++ trunk/kdump/src/Kdump.ycp Fri Nov 28 10:13:53 2008 @@ -734,7 +734,6 @@ al_mem = al_mem *2; alocated_memory = tostring(al_mem); } - // bnc #446480 - Fine-tune kdump memory proposal if ((Arch::ia64()) && (total_memory >= 1024)) { @@ -743,8 +742,12 @@ alocated_memory = "256"; else if ((total_memory_gigabyte >= 12) && (total_memory_gigabyte <128)) alocated_memory = "512"; - else if ((total_memory_gigabyte >= 128) && (total_memory_gigabyte <512)) + else if ((total_memory_gigabyte >= 128) && (total_memory_gigabyte <256)) + alocated_memory = "768"; + else if ((total_memory_gigabyte >= 256) && (total_memory_gigabyte <378)) alocated_memory = "1024"; + else if ((total_memory_gigabyte >= 378) && (total_memory_gigabyte <512)) + alocated_memory = "1536"; else if ((total_memory_gigabyte >= 512) && (total_memory_gigabyte <768)) alocated_memory = "2048"; else if (total_memory_gigabyte >= 768) -- 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] r53681 - /trunk/gtk/src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: rpmcruz Date: Fri Nov 28 04:33:27 2008 New Revision: 53681 URL: http://svn.opensuse.org/viewcvs/yast?rev=53681&view=rev Log: No need to use utf8-compare for "== 0" checks. Modified: trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5368… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Fri Nov 28 04:33:27 2008 @@ -2077,9 +2077,9 @@ if (r != 0) { const char *unknown = zypp_tag_group_enum_to_localised_text (PK_GROUP_ENUM_UNKNOWN); - if (!g_utf8_collate (a, unknown)) + if (!strcmp (a, unknown)) return 1; - if (!g_utf8_collate (b, unknown)) + if (!strcmp (b, unknown)) return -1; } return r; -- 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] r53680 - in /trunk/gtk: ChangeLog src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: rpmcruz Date: Fri Nov 28 04:30:31 2008 New Revision: 53680 URL: http://svn.opensuse.org/viewcvs/yast?rev=53680&view=rev Log: * src/yzyppwrapper.cc: i18n fix: use g_utf8_collate in order to properly sort languages and PackageKit categories. Modified: trunk/gtk/ChangeLog trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=53680&r1=53679… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Nov 28 04:30:31 2008 @@ -28,6 +28,9 @@ append a shadow column because GTK doesn't support not having no expand columns. + * src/yzyppwrapper.cc: i18n fix: use g_utf8_collate in order to properly + sort languages and PackageKit categories. + 2008-11-23 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkwizard.c: don't show "more" link on help line if the rest Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5368… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Fri Nov 28 04:30:31 2008 @@ -1290,6 +1290,12 @@ Package *b = (Package *) _b; return strcasecmp (a->name().c_str(), b->name().c_str()); } + static gint compare_utf8 (gconstpointer _a, gconstpointer _b) + { // slower -- don't use for packages -- only for patterns and languages + Package *a = (Package *) _a; + Package *b = (Package *) _b; + return g_utf8_collate (a->name().c_str(), b->name().c_str()); + } static gint compare_pattern (gconstpointer a, gconstpointer b) { ZyppPattern pattern1 = tryCastToZyppPattern (((PackageSel *) ((Package *) a)->impl)->m_sel->theObj()); @@ -1380,6 +1386,8 @@ // a sort merge. Don't use g_slist_insert_sorted() -- its linear if (type == Ypp::Package::PATTERN_TYPE) pool = g_slist_sort (pool, inner::compare_pattern); + else if (type == Ypp::Package::LANGUAGE_TYPE) + pool = g_slist_sort (pool, inner::compare_utf8); else pool = g_slist_sort (pool, inner::compare); packages[type] = pool; @@ -2037,7 +2045,7 @@ return !strcmp (b, "Other") ? 0 : 1; if (!strcmp (b, "Other")) return -1; - return strcmp (a, b); + return strcasecmp (a, b); } }; @@ -2065,13 +2073,13 @@ struct inner { static int cmp (const char *a, const char *b) { - int r = strcmp (a, b); + int r = g_utf8_collate (a, b); if (r != 0) { const char *unknown = zypp_tag_group_enum_to_localised_text (PK_GROUP_ENUM_UNKNOWN); - if (!strcmp (a, unknown)) + if (!g_utf8_collate (a, unknown)) return 1; - if (!strcmp (b, unknown)) + if (!g_utf8_collate (b, unknown)) return -1; } return r; -- 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] r53679 - in /trunk/gtk: ./ src/ tests/
by rpmcruz＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: rpmcruz Date: Fri Nov 28 03:40:29 2008 New Revision: 53679 URL: http://svn.opensuse.org/viewcvs/yast?rev=53679&view=rev Log: * src/YGBarGraph.cc (YPartitionSplitter): fix for arabic: tell GTK to not mirror the splitter since we want to keep the partition's order. * src/YGPackageSelector (ListView): fix for arabic: properly align packages names and descriptions to the right (otherwise, Pango tries to be smart when aligning English multi-line text for RTL). * src/YGUI.cc (glyph): fix for arabic: on yast initilization a right-arrow is used: make it use a left one for arabic. * src/ygtkcellrenderertextpixbuf.c: fix for arabic: made the alignment when an icon is set working properly. (bug fix 449627) * src/ygtkfixed.c: fix for arabic: mirror the UI for arabic. libyui probably should do this in the future. * src/ygtklinklabel.c: fix for arabic: header open help line's "more" link wasn't being placed properly. * src/ygtksteps.c: fix for arabic: mirror the marker placement. * src/YGSelectionModel.cc: fixed getMaxDepth() for lists. * src/YGComboBox.cc: when too many items, wrap the combo into columns. * src/YGTable.cc (YTable): when the last column alignment flag is set, append a shadow column because GTK doesn't support not having no expand columns. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGBarGraph.cc trunk/gtk/src/YGComboBox.cc trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGPushButton.cc trunk/gtk/src/YGSelectionModel.cc trunk/gtk/src/YGTable.cc trunk/gtk/src/YGUI.cc trunk/gtk/src/ygtkcellrenderertextpixbuf.c trunk/gtk/src/ygtkfixed.c trunk/gtk/src/ygtklinklabel.c trunk/gtk/src/ygtksteps.c trunk/gtk/src/yzyppwrapper.cc trunk/gtk/tests/Table3-4.ycp Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=53679&r1=53678… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Nov 28 03:40:29 2008 @@ -1,3 +1,33 @@ +2008-11-28 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGBarGraph.cc (YPartitionSplitter): fix for arabic: tell GTK + to not mirror the splitter since we want to keep the partition's order. + + * src/YGPackageSelector (ListView): fix for arabic: properly align packages + names and descriptions to the right (otherwise, Pango tries to be smart + when aligning English multi-line text for RTL). + + * src/YGUI.cc (glyph): fix for arabic: on yast initilization a right-arrow + is used: make it use a left one for arabic. + + * src/ygtkcellrenderertextpixbuf.c: fix for arabic: made the alignment + when an icon is set working properly. (bug fix 449627) + + * src/ygtkfixed.c: fix for arabic: mirror the UI for arabic. libyui probably + should do this in the future. + + * src/ygtklinklabel.c: fix for arabic: header open help line's "more" + link wasn't being placed properly. + + * src/ygtksteps.c: fix for arabic: mirror the marker placement. + + * src/YGSelectionModel.cc: fixed getMaxDepth() for lists. + * src/YGComboBox.cc: when too many items, wrap the combo into columns. + + * src/YGTable.cc (YTable): when the last column alignment flag is set, + append a shadow column because GTK doesn't support not having no + expand columns. + 2008-11-23 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkwizard.c: don't show "more" link on help line if the rest Modified: trunk/gtk/src/YGBarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGBarGraph.cc?rev=53679&… ============================================================================== --- trunk/gtk/src/YGBarGraph.cc (original) +++ trunk/gtk/src/YGBarGraph.cc Fri Nov 28 03:40:29 2008 @@ -93,6 +93,10 @@ m_new_spin = gtk_spin_button_new_with_range (minNewPartSize, maxNewPartSize(), 1); + // keep the partition's order + gtk_widget_set_direction (labels_box, GTK_TEXT_DIR_LTR); + gtk_widget_set_direction (slider_box, GTK_TEXT_DIR_LTR); + gtk_box_pack_start (GTK_BOX (slider_box), m_free_spin, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (slider_box), m_scale, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (slider_box), m_new_spin, FALSE, FALSE, 0); Modified: trunk/gtk/src/YGComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGComboBox.cc?rev=53679&… ============================================================================== --- trunk/gtk/src/YGComboBox.cc (original) +++ trunk/gtk/src/YGComboBox.cc Fri Nov 28 03:40:29 2008 @@ -37,12 +37,14 @@ connect (getWidget(), "changed", G_CALLBACK (selected_changed_cb), this); + // realize doesn't seem to work, so... + g_timeout_add_full (G_PRIORITY_LOW, 500, realize_cb, this, NULL); } inline GtkComboBox *getComboBox() { return GTK_COMBO_BOX (getWidget()); } - GtkEntry *getEntry () + GtkEntry *getEntry() { if (!GTK_IS_COMBO_BOX_ENTRY (getWidget())) { yuiError() << "YGComboBox: trying to edit read-only combo box\n"; @@ -127,6 +129,18 @@ YGWIDGET_IMPL_COMMON YGLABEL_WIDGET_IMPL_SET_LABEL_CHAIN (YComboBox) YGSELECTION_WIDGET_IMPL_ALL (YComboBox) + + static gboolean realize_cb (gpointer pData) + { + // some combo boxes have too many items -- wrap the thing in columns + YGComboBox *pThis = (YGComboBox *) pData; + int rows; + pThis->getMaxDepth (&rows); + int cols = MIN (rows / 20, 3) + 1; + if (cols > 1) // this changes the popup width, so only set it for cols > 1 + gtk_combo_box_set_wrap_width (pThis->getComboBox(), cols); + return FALSE; + } }; YComboBox *YGWidgetFactory::createComboBox (YWidget *parent, const string &label, bool editable) Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Fri Nov 28 03:40:29 2008 @@ -435,12 +435,17 @@ gtk_cell_renderer_set_fixed_size (renderer, -1, height); } g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + gboolean reverse = gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL; + if (reverse) { // work-around: Pango ignored alignment flag on RTL + gtk_widget_set_direction (m_widget, GTK_TEXT_DIR_LTR); + g_object_set (renderer, "alignment", PANGO_ALIGN_RIGHT, NULL); + } column = gtk_tree_view_column_new_with_attributes ("", renderer, "markup", YGtkZyppModel::NAME_DESCRIPTION_COLUMN, NULL); gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_fixed_width (column, 50 /* it will expand */); gtk_tree_view_column_set_expand (column, TRUE); - gtk_tree_view_append_column (view, column); + gtk_tree_view_insert_column (view, column, reverse ? 0 : -1); gtk_tree_view_set_fixed_height_mode (view, TRUE); gtk_tree_view_set_show_expanders (view, FALSE); /* would conflict with icons */ Modified: trunk/gtk/src/YGPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPushButton.cc?rev=5367… ============================================================================== --- trunk/gtk/src/YGPushButton.cc (original) +++ trunk/gtk/src/YGPushButton.cc Fri Nov 28 03:40:29 2008 @@ -90,7 +90,7 @@ m_customIcon = true; string path (icon); if (path[0] != '/') - path = ICON_DIR + path; + path = std::string (THEMEDIR) + "/" + path; GError *error = 0; GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (path.c_str(), &error); Modified: trunk/gtk/src/YGSelectionModel.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGSelectionModel.cc?rev=… ============================================================================== --- trunk/gtk/src/YGSelectionModel.cc (original) +++ trunk/gtk/src/YGSelectionModel.cc Fri Nov 28 03:40:29 2008 @@ -200,7 +200,6 @@ int YGSelectionModel::getMaxDepth (int *rows) { - if (!isTree) return 0; GtkTreeModel *model = getModel(); int depth = 0; *rows = 0; GtkTreeIter iter; Modified: trunk/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=53679&r1=… ============================================================================== --- trunk/gtk/src/YGTable.cc (original) +++ trunk/gtk/src/YGTable.cc Fri Nov 28 03:40:29 2008 @@ -68,8 +68,10 @@ case YAlignUnchanged: break; } - if (xalign != -1) + if (xalign != -1) { g_object_set (renderer, "xalign", xalign, NULL); + gtk_tree_view_column_set_alignment (column, xalign); + } gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (getView(), column); @@ -93,6 +95,12 @@ gtk_tree_view_append_column (getView(), column); } + void appendDumbColumn() + { + IMPL + gtk_tree_view_append_column (getView(), gtk_tree_view_column_new()); + } + void setModel() { gtk_tree_view_set_model (GTK_TREE_VIEW (getWidget()), getModel()); } @@ -216,7 +224,11 @@ createModel (types); for (int i = 0; i < columns(); i++) { int col = i*2; - appendIconTextColumn (header (i), alignment (i), col, col+1); + YAlignmentType align = alignment (i); + appendIconTextColumn (header (i), align, col, col+1); + if ((align == YAlignCenter || align == YAlignEnd) && i == columns()-1) + // if last col is aligned: add another so that it doesn't expand. + appendDumbColumn(); } setModel(); @@ -274,6 +286,8 @@ GList *columns = gtk_tree_view_get_columns (getView()); for (GList *i = columns; i; i = i->next, n++) { GtkTreeViewColumn *column = (GtkTreeViewColumn *) i->data; + if (n >= this->columns()) + break; if (sortable) { int index = (n*2)+1; if (!sortable) Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=53679&r1=536… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Fri Nov 28 03:40:29 2008 @@ -539,7 +539,7 @@ if (sym == YUIGlyph_CheckMark) return "\u2714"; if (sym == YUIGlyph_BulletArrowRight) - return "\u279c"; + return (gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL) ? "\u21e6" : "\u279c"; if (sym == YUIGlyph_BulletCircle) return "\u274d"; if (sym == YUIGlyph_BulletSquare) Modified: trunk/gtk/src/ygtkcellrenderertextpixbuf.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkcellrenderertextpixb… ============================================================================== --- trunk/gtk/src/ygtkcellrenderertextpixbuf.c (original) +++ trunk/gtk/src/ygtkcellrenderertextpixbuf.c Fri Nov 28 03:40:29 2008 @@ -79,6 +79,8 @@ return NULL; } +#define BORDER 1 + static void ygtk_cell_renderer_text_pixbuf_get_size (GtkCellRenderer *cell, GtkWidget *widget, GdkRectangle *cell_area, gint *xoffset, gint *yoffset, gint *width, gint *height) @@ -110,15 +112,14 @@ g_object_unref (G_OBJECT (layout)); } - *width += cell->xpad*2; - *height += cell->ypad*2 + 2; + *width += (cell->xpad+BORDER)*2; + *height += (cell->ypad+BORDER)*2; } static void ygtk_cell_renderer_text_pixbuf_render (GtkCellRenderer *cell, GdkDrawable *window, GtkWidget *widget, GdkRectangle *background_area, GdkRectangle *cell_area, GdkRectangle *expose_area, GtkCellRendererState flags) { - GtkCellRendererText *tcell = GTK_CELL_RENDERER_TEXT (cell); YGtkCellRendererTextPixbuf *tpcell = YGTK_CELL_RENDERER_TEXT_PIXBUF (cell); GtkStateType state; @@ -140,45 +141,55 @@ state = GTK_STATE_NORMAL; } - int x = cell_area->x, y = cell_area->y; + // positioning + gboolean reverse = gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL; gfloat xalign = cell->xalign, yalign = cell->yalign; - if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) + if (reverse) xalign = 1.0 - xalign; - if (tpcell->pixbuf) { - int w, h; - w = gdk_pixbuf_get_width (tpcell->pixbuf); - h = gdk_pixbuf_get_height (tpcell->pixbuf); - - int xoffset, yoffset; - xoffset = xalign * (cell_area->width - (w + (2*cell->xpad))); - yoffset = yalign * (cell_area->height - (h + (2*cell->ypad))); - - cairo_t *cr = gdk_cairo_create (window); - gdk_cairo_set_source_pixbuf (cr, tpcell->pixbuf, x+xoffset, y+yoffset); - - cairo_rectangle (cr, x+xoffset, y+yoffset, w, h); - cairo_fill (cr); - cairo_destroy (cr); - - x += w + PIXBUF_TEXT_SPACING; + GdkPixbuf *pixbuf = tpcell->pixbuf; + int pixbuf_width = 0, pixbuf_height = 0; + if (pixbuf) { + pixbuf_width = gdk_pixbuf_get_width (pixbuf); + pixbuf_height = gdk_pixbuf_get_height (pixbuf); } - if (tcell->text) { - PangoLayout *layout = create_layout (tpcell, widget); - + PangoLayout *layout = create_layout (tpcell, widget); + int text_width = 0, text_height = 0; + if (layout) { PangoRectangle rect; pango_layout_get_pixel_extents (layout, NULL, &rect); + text_width = rect.width; + text_height = rect.height; + } - int xoffset, yoffset; - xoffset = xalign * (cell_area->width - (rect.width + (2*cell->xpad))); - yoffset = yalign * (cell_area->height - (rect.height + (2*cell->ypad))); + int spacing = (text_width && pixbuf_width) ? PIXBUF_TEXT_SPACING : 0; + int offset_x = xalign * (cell_area->width - (text_width + pixbuf_width + spacing)); + int text_x = offset_x, text_y; + if (pixbuf_width && !reverse) + text_x += (pixbuf_width + spacing); + text_y = yalign * (cell_area->height - text_height); + + int pixbuf_x = offset_x, pixbuf_y; + if (text_width && reverse) + pixbuf_x += (text_width + spacing); + pixbuf_y = yalign * (cell_area->height - pixbuf_height); + + // paint + int x = cell_area->x + cell->xpad+BORDER, y = cell_area->y + cell->ypad+BORDER; + if (pixbuf) { + cairo_t *cr = gdk_cairo_create (window); + gdk_cairo_set_source_pixbuf (cr, pixbuf, pixbuf_x+x, pixbuf_y+y); + cairo_rectangle (cr, pixbuf_x+x, pixbuf_y+y, pixbuf_width, pixbuf_height); + cairo_fill (cr); + cairo_destroy (cr); + } + if (layout) { GtkStyle *style = gtk_widget_get_style (widget); gtk_paint_layout (style, window, state, TRUE, expose_area, widget, - "cellrenderertext", x+xoffset, y+yoffset, layout); - + "cellrenderertext", text_x+x, text_y+y, layout); g_object_unref (G_OBJECT (layout)); } } Modified: trunk/gtk/src/ygtkfixed.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkfixed.c?rev=53679&r1… ============================================================================== --- trunk/gtk/src/ygtkfixed.c (original) +++ trunk/gtk/src/ygtkfixed.c Fri Nov 28 03:40:29 2008 @@ -91,8 +91,7 @@ } } -static void ygtk_fixed_size_request (GtkWidget *widget, - GtkRequisition *requisition) +static void ygtk_fixed_size_request (GtkWidget *widget, GtkRequisition *requisition) { YGtkFixed *fixed = YGTK_FIXED (widget); fixed->preferred_size_cb (fixed, &requisition->width, &requisition->height, @@ -101,8 +100,7 @@ GTK_WIDGET_CLASS (ygtk_fixed_parent_class)->size_request (widget, requisition); } -static void ygtk_fixed_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) +static void ygtk_fixed_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { YGtkFixed *fixed = YGTK_FIXED (widget); fixed->set_size_cb (fixed, allocation->width, allocation->height, fixed->data); @@ -110,7 +108,10 @@ GSList *i; for (i = fixed->children; i; i = i->next) { YGtkFixedChild *child = i->data; - int x = child->x + allocation->x; + int x = child->x; + if (gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL) + x = allocation->width - (child->x + child->width); + x += allocation->x; int y = child->y + allocation->y; GtkAllocation child_alloc = { x, y, child->width, child->height }; Modified: trunk/gtk/src/ygtklinklabel.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtklinklabel.c?rev=5367… ============================================================================== --- trunk/gtk/src/ygtklinklabel.c (original) +++ trunk/gtk/src/ygtklinklabel.c Fri Nov 28 03:40:29 2008 @@ -74,7 +74,6 @@ label->layout = gtk_widget_create_pango_layout (widget, label->text); pango_layout_set_single_paragraph_mode (label->layout, TRUE); pango_layout_set_ellipsize (label->layout, PANGO_ELLIPSIZE_END); - pango_layout_set_width (label->layout, widget->allocation.width * PANGO_SCALE); } if (!label->link_layout) { label->link_layout = gtk_widget_create_pango_layout (widget, label->link); @@ -118,8 +117,7 @@ #define SPACING 4 -static void ygtk_link_label_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) +static void ygtk_link_label_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { GTK_WIDGET_CLASS (ygtk_link_label_parent_class)->size_allocate (widget, allocation); YGtkLinkLabel *label = YGTK_LINK_LABEL (widget); @@ -139,9 +137,12 @@ x = allocation->x + logical.width/PANGO_SCALE + SPACING; else x = allocation->x + (allocation->width - link_width); + if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) + x = (2*allocation->x + allocation->width) - (x + link_width); gdk_window_move_resize (label->link_window, x, allocation->y, link_width, allocation->height); - pango_layout_set_width (label->layout, width); + if (logical.width > width) + pango_layout_set_width (label->layout, width); gdk_window_show (label->link_window); } else @@ -157,6 +158,11 @@ gint x = 0, y = 0; PangoLayout *layout = 0; if (event->window == widget->window) { + if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) { + PangoRectangle extent; + pango_layout_get_extents (label->layout, NULL, &extent); + x = widget->allocation.width - extent.width/PANGO_SCALE; + } x += widget->allocation.x; y += widget->allocation.y; layout = label->layout; Modified: trunk/gtk/src/ygtksteps.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtksteps.c?rev=53679&r1… ============================================================================== --- trunk/gtk/src/ygtksteps.c (original) +++ trunk/gtk/src/ygtksteps.c Fri Nov 28 03:40:29 2008 @@ -29,8 +29,12 @@ PangoContext *context = gtk_widget_get_pango_context (GTK_WIDGET (steps)); steps->check_mark_layout = pango_layout_new (context); steps->current_mark_layout = pango_layout_new (context); - pango_layout_set_markup (steps->check_mark_layout, "\u2714", -1); - pango_layout_set_markup (steps->current_mark_layout, "\u2192", -1); + + const gchar *check = "\u2714", *current = "\u2192"; + if (gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL) + current = "\u2190"; + pango_layout_set_markup (steps->check_mark_layout, check, -1); + pango_layout_set_markup (steps->current_mark_layout, current, -1); steps->current_mark_timeout_id = steps->current_mark_frame = 0; } @@ -77,6 +81,7 @@ GTK_WIDGET_CLASS (ygtk_steps_parent_class)->expose_event (widget, event); YGtkSteps *steps = YGTK_STEPS (widget); + gboolean reverse = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL; GtkStyle *style = gtk_widget_get_style (widget); GList *children = gtk_container_get_children (GTK_CONTAINER (widget)), *i; int n = 0; @@ -88,13 +93,21 @@ PangoLayout *mark = (n == steps->current_step) ? steps->current_mark_layout : steps->check_mark_layout; int x = label->allocation.x, y = label->allocation.y; - x += 4; + if (reverse) { + PangoRectangle rect; + pango_layout_get_pixel_extents (mark, NULL, &rect); + x += label->allocation.width - rect.width - 4; + } + else + x += 4; if (n == steps->current_step) { + int offset; if (steps->current_mark_frame < CURRENT_MARK_FRAMES_NB/2) - x -= steps->current_mark_frame * CURRENT_MARK_ANIMATION_OFFSET; + offset = steps->current_mark_frame * CURRENT_MARK_ANIMATION_OFFSET; else - x -= (CURRENT_MARK_FRAMES_NB - steps->current_mark_frame) * + offset = (CURRENT_MARK_FRAMES_NB - steps->current_mark_frame) * CURRENT_MARK_ANIMATION_OFFSET; + x += offset * (reverse ? 1 : -1); } gtk_paint_layout (style, widget->window, GTK_STATE_NORMAL, TRUE, Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5367… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Fri Nov 28 03:40:29 2008 @@ -1162,6 +1162,7 @@ virtual std::string name() { return m_locale.name(); } + virtual std::string summary() { int installed, total; Modified: trunk/gtk/tests/Table3-4.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/Table3-4.ycp?rev=53679… ============================================================================== --- trunk/gtk/tests/Table3-4.ycp (original) +++ trunk/gtk/tests/Table3-4.ycp Fri Nov 28 03:40:29 2008 @@ -23,7 +23,7 @@ `VBox ( `Heading ("Prices"), `MinSize (30, 10, - `Table (`id(`table), `header("Name", "price"), itemlist1) + `Table (`id(`table), `header("Name", `Right ("price")), itemlist1) ), `Right ( `HBox ( -- 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] r53678 - /tags/stable-2_17_16/registration/
by jdsn＠svn.opensuse.org 27 Nov '08

27 Nov '08

Author: jdsn Date: Thu Nov 27 22:47:31 2008 New Revision: 53678 URL: http://svn.opensuse.org/viewcvs/yast?rev=53678&view=rev Log: Created tag stable-2_17_16 for registration Added: tags/stable-2_17_16/registration/ - copied from r53677, trunk/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0