November 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r53747 - /trunk/storage/storage/src/include/ep-hd-dialogs.ycp
by aschnell＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: aschnell Date: Fri Nov 28 21:01:55 2008 New Revision: 53747 URL: http://svn.opensuse.org/viewcvs/yast?rev=53747&view=rev Log: - removed unknown widget option Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Fri Nov 28 21:01:55 2008 @@ -124,12 +124,10 @@ // radio button text `LeftRadioButtonWithAttachment(`id(`manual_region), `opt(`notify), _("Custom Region"), `VBox(`id(`manual_region_attachment), - `MinWidth(10, `IntField(`id(`start_cyl), `opt(`shrinkable), - _("Start Cylinder"), 1, cyl_count, - Region::Start(region))), - `MinWidth(10, `IntField(`id(`end_cyl), `opt(`shrinkable), - _("End Cylinder"), 1, cyl_count, - Region::End(region))) + `MinWidth(10, `IntField(`id(`start_cyl), _("Start Cylinder"), + 1, cyl_count, Region::Start(region))), + `MinWidth(10, `IntField(`id(`end_cyl), _("End Cylinder"), + 1, cyl_count, Region::End(region))) )) ) ) -- 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] r53746 - in /trunk/gtk: ChangeLog src/ygtkrichtext.c
by rpmcruz＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: rpmcruz Date: Fri Nov 28 20:56:24 2008 New Revision: 53746 URL: http://svn.opensuse.org/viewcvs/yast?rev=53746&view=rev Log: * src/ygtkrichtext.c: arabic fix (bug fix 449600): GtkTextView only detects Arabic in a paragraph per paragraph basis. Work around it so the entire text, including the English parts, are aligned to the right. Modified: trunk/gtk/ChangeLog trunk/gtk/src/ygtkrichtext.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=53746&r1=53745… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Nov 28 20:56:24 2008 @@ -34,6 +34,10 @@ * src/YGPackageSelector.cc (ListView): arabic fix: because of our previous hack, status column is now 1: adjust tooltips. + * src/ygtkrichtext.c: arabic fix (bug fix 449600): GtkTextView only detects + Arabic in a paragraph per paragraph basis. Work around it so the entire + text, including the English parts, are aligned to the right. + 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/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=53746… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Fri Nov 28 20:56:24 2008 @@ -358,6 +358,7 @@ void ygtk_rich_text_init (YGtkRichText *rtext) { + GtkWidget *widget = GTK_WIDGET (rtext); GtkTextView *tview = GTK_TEXT_VIEW (rtext); gtk_text_view_set_wrap_mode (tview, GTK_WRAP_WORD_CHAR); gtk_text_view_set_editable (tview, FALSE); @@ -366,12 +367,12 @@ gtk_text_view_set_left_margin (tview, 4); // Init link support - GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (rtext)); + GdkDisplay *display = gtk_widget_get_display (widget); rtext->hand_cursor = gdk_cursor_new_for_display (display, GDK_HAND2); gdk_cursor_ref (rtext->hand_cursor); #if GTK_CHECK_VERSION(2,10,0) - gtk_widget_style_get (GTK_WIDGET (rtext), "link_color", &link_color, NULL); + gtk_widget_style_get (widget, "link_color", &link_color, NULL); #endif g_signal_connect (tview, "event-after", @@ -379,11 +380,12 @@ // Create a few tags like 'h3', 'b', 'i'. others need to be created as we parse GtkTextBuffer *buffer = gtk_text_view_get_buffer (tview); - PangoFontDescription *font_desc = GTK_WIDGET (rtext)->style->font_desc; + PangoFontDescription *font_desc = widget->style->font_desc; int size = pango_font_description_get_size (font_desc); if (pango_font_description_get_size_is_absolute (font_desc)) size /= PANGO_SCALE; + gtk_text_buffer_create_tag (buffer, "body", NULL); gtk_text_buffer_create_tag (buffer, "h1", "weight", PANGO_WEIGHT_HEAVY, "size", (int)(size * PANGO_SCALE_XX_LARGE), "pixels-below-lines", 16, "foreground", "#5c5c5c", NULL); @@ -410,6 +412,7 @@ gtk_text_buffer_create_tag (buffer, "i", "style", PANGO_STYLE_ITALIC, NULL); gtk_text_buffer_create_tag (buffer, "u", "underline", PANGO_UNDERLINE_SINGLE, NULL); gtk_text_buffer_create_tag (buffer, "center", "justification", GTK_JUSTIFY_CENTER, NULL); + gtk_text_buffer_create_tag (buffer, "right", "justification", GTK_JUSTIFY_RIGHT, NULL); // helpers gtk_text_buffer_create_tag (buffer, "keyword", "background", "yellow", NULL); } @@ -592,9 +595,6 @@ gpointer user_data, GError **error) { // Called for open tags <foo bar="baz"> - if (!g_ascii_strcasecmp (element_name, "body")) - return; - GRTParseState *state = (GRTParseState*) user_data; GRTPTag *tag = g_malloc (sizeof (GRTPTag)); GtkTextIter iter; @@ -712,9 +712,6 @@ gpointer user_data, GError **error) { // Called for close tags </foo> - if (!g_ascii_strcasecmp (element_name, "body")) - return; - GRTParseState *state = (GRTParseState*) user_data; if (g_list_length (state->htags) == 0) { @@ -835,6 +832,26 @@ return g_object_new (YGTK_TYPE_RICH_TEXT, NULL); } +static void ygtk_rich_text_set_rtl (YGtkRichText *rtext) +{ + GtkTextView *view = GTK_TEXT_VIEW (rtext); + GtkTextBuffer *buffer = gtk_text_view_get_buffer (view); + GtkTextIter iter; + gtk_text_buffer_get_start_iter (buffer, &iter); + do { + GtkTextIter end = iter; + if (!gtk_text_iter_forward_line (&end)) + gtk_text_buffer_get_end_iter (buffer, &end); + + gchar *text = gtk_text_iter_get_text (&iter, &end); + PangoDirection dir = pango_find_base_dir (text, -1); + if (dir == PANGO_DIRECTION_LTR) + gtk_text_buffer_apply_tag_by_name (buffer, "right", &iter, &end); + + iter = end; + } while (!gtk_text_iter_is_end (&iter)); +} + void ygtk_rich_text_set_text (YGtkRichText* rtext, const gchar* text, gboolean plain_mode) { GtkTextBuffer *buffer; @@ -871,6 +888,11 @@ if (gtk_text_iter_backward_char (&before_end_it) && gtk_text_iter_get_char (&before_end_it) == '\n') gtk_text_buffer_delete (buffer, &before_end_it, &end_it); + + // GtkTextView does LTR and RTL depending on the paragraph; we want + // to change that behavior so it's RTL to the all thing for Arabic + if (gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL) + ygtk_rich_text_set_rtl (rtext); } /* gtk_text_iter_forward_search() is case-sensitive so we roll our own. -- 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] r53745 - /tags/stable-2_17_50/packager/
by lslezak＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: lslezak Date: Fri Nov 28 18:25:32 2008 New Revision: 53745 URL: http://svn.opensuse.org/viewcvs/yast?rev=53745&view=rev Log: Created tag stable-2_17_50 for packager Added: tags/stable-2_17_50/packager/ - copied from r53744, trunk/packager/ -- 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] r53744 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: lslezak Date: Fri Nov 28 18:23:35 2008 New Revision: 53744 URL: http://svn.opensuse.org/viewcvs/yast?rev=53744&view=rev Log: - fixed changing status of the repositories belonging to a service (bnc#444366) - 2.17.50 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=53744&r1=53… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Nov 28 18:23:35 2008 @@ -1 +1 @@ -2.17.49 +2.17.50 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Nov 28 18:23:35 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 28 18:15:42 CET 2008 - lslezak(a)suse.cz + +- fixed changing status of the repositories belonging to a service + (bnc#444366) +- 2.17.50 + +------------------------------------------------------------------- Fri Nov 28 12:17:59 CET 2008 - locilka(a)suse.cz - DefaultDesktop module now returns desktop name translated using Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Fri Nov 28 18:23:35 2008 @@ -442,8 +442,53 @@ } boolean Write() { - y2milestone("New config: %1", sourceStatesOut); - boolean success = Pkg::SourceEditSet( sourceStatesOut ); + boolean success = true; + + // evaluate removed and new services + list<string> deleted_services = newServices(serviceStatesOut, serviceStatesIn); + y2milestone("Deleted services: %1", deleted_services); + list<string> added_services = newServices(serviceStatesIn, serviceStatesOut); + y2milestone("Added services: %1", added_services); + + foreach(string alias, deleted_services, + { + y2milestone("Removing service %1", alias); + success = success && Pkg::ServiceDelete(alias); + } + ); + + y2milestone("New service config: %1", sourceStatesOut); + foreach(map<string,any> s, serviceStatesOut, + { + string alias = s["alias"]:""; + + if (contains(added_services, alias)) + { + y2milestone("Adding service %1", alias); + string new_url = s["url"]:""; + + if (new_url != "") + { + y2milestone("aliases: %1", Pkg::ServiceAliases()); + success = success && Pkg::ServiceAdd(alias, new_url); + // set enabled and autorefresh flags + success = success && Pkg::ServiceSet(alias, s); + } + else + { + y2error("Empty URL for service %1", alias); + } + } + else + { + y2milestone("Modifying service %1", alias); + success = success && Pkg::ServiceSet(alias, s); + } + } + ); + + y2milestone("New repo config: %1", sourceStatesOut); + success = success && Pkg::SourceEditSet( sourceStatesOut ); // we must sync before the repositories are deleted from zypp // otherwise we will not get their details @@ -488,48 +533,6 @@ } ); - // evaluate removed and new services - list<string> deleted_services = newServices(serviceStatesOut, serviceStatesIn); - y2milestone("Deleted services: %1", deleted_services); - list<string> added_services = newServices(serviceStatesIn, serviceStatesOut); - y2milestone("Added services: %1", added_services); - - foreach(string alias, deleted_services, - { - y2milestone("Removing service %1", alias); - success = success && Pkg::ServiceDelete(alias); - } - ); - - foreach(map<string,any> s, serviceStatesOut, - { - string alias = s["alias"]:""; - - if (contains(added_services, alias)) - { - y2milestone("Adding service %1", alias); - string new_url = s["url"]:""; - - if (new_url != "") - { - y2milestone("aliases: %1", Pkg::ServiceAliases()); - success = success && Pkg::ServiceAdd(alias, new_url); - // set enabled and autorefresh flags - success = success && Pkg::ServiceSet(alias, s); - } - else - { - y2error("Empty URL for service %1", alias); - } - } - else - { - y2milestone("Modifying service %1", alias); - success = success && Pkg::ServiceSet(alias, s); - } - } - ); - success = success && KeyManager::Write(); // store repositories and services in the persistent libzypp 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] r53743 - /tags/stable-2_17_4/apparmor/
by kmachalkova＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: kmachalkova Date: Fri Nov 28 18:02:59 2008 New Revision: 53743 URL: http://svn.opensuse.org/viewcvs/yast?rev=53743&view=rev Log: Created tag stable-2_17_4 for apparmor Added: tags/stable-2_17_4/apparmor/ - copied from r53742, trunk/apparmor/ -- 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] r53742 - in /trunk/apparmor: VERSION package/yast2-apparmor.changes
by kmachalkova＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: kmachalkova Date: Fri Nov 28 18:01:34 2008 New Revision: 53742 URL: http://svn.opensuse.org/viewcvs/yast?rev=53742&view=rev Log: version 2.17.4 Modified: trunk/apparmor/VERSION trunk/apparmor/package/yast2-apparmor.changes Modified: trunk/apparmor/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/VERSION?rev=53742&r1=53… ============================================================================== --- trunk/apparmor/VERSION (original) +++ trunk/apparmor/VERSION Fri Nov 28 18:01:34 2008 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: trunk/apparmor/package/yast2-apparmor.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/package/yast2-apparmor.… ============================================================================== --- trunk/apparmor/package/yast2-apparmor.changes (original) +++ trunk/apparmor/package/yast2-apparmor.changes Fri Nov 28 18:01:34 2008 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Fri Nov 28 17:53:44 CET 2008 - kmachalkova(a)suse.cz + +- Removed source of UI syntax error - invalid items listing + (bnc#441510) +- Integrated jjohansen's patch for bnc#258079 (e-mail address + validation) +- Make translatable strings from Perl agents really translated (and + correctly encoded) (bnc#448390) +- 2.17.4 + +------------------------------------------------------------------- Sat Oct 18 10:04:31 CEST 2008 - aschnell(a)suse.de - Fixed help text (bnc #436491) -- 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] r53741 - /trunk/apparmor/src/agents/ag_reports_sched
by kmachalkova＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: kmachalkova Date: Fri Nov 28 18:00:14 2008 New Revision: 53741 URL: http://svn.opensuse.org/viewcvs/yast?rev=53741&view=rev Log: Perl prints warning if the variable does not exist yet Modified: trunk/apparmor/src/agents/ag_reports_sched Modified: trunk/apparmor/src/agents/ag_reports_sched URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_reports_s… ============================================================================== --- trunk/apparmor/src/agents/ag_reports_sched (original) +++ trunk/apparmor/src/agents/ag_reports_sched Fri Nov 28 18:00:14 2008 @@ -636,7 +636,7 @@ my $db = undef; - if ( $args->{'name'} =~ /Edit\s+(\w.+)\s+Sched/ ) { + if ( defined( $args->{'name'}) && $args->{'name'} =~ /Edit\s+(\w.+)\s+Sched/ ) { $args->{'name'} = $1; } -- 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] r53740 - in /trunk/apparmor/src/agents: ag_genprof ag_logparse ag_reports_confined ag_reports_sched
by kmachalkova＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: kmachalkova Date: Fri Nov 28 17:50:49 2008 New Revision: 53740 URL: http://svn.opensuse.org/viewcvs/yast?rev=53740&view=rev Log: Make translatable strings from agents really translated (and correctly encoded) (#448390) Modified: trunk/apparmor/src/agents/ag_genprof trunk/apparmor/src/agents/ag_logparse trunk/apparmor/src/agents/ag_reports_confined trunk/apparmor/src/agents/ag_reports_sched Modified: trunk/apparmor/src/agents/ag_genprof URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_genprof?r… ============================================================================== --- trunk/apparmor/src/agents/ag_genprof (original) +++ trunk/apparmor/src/agents/ag_genprof Fri Nov 28 17:50:49 2008 @@ -15,14 +15,19 @@ use warnings; use strict; use Data::Dumper; +use Encode; use Getopt::Long; use Locale::gettext; use POSIX; use Immunix::SubDomain; -# initialize the local poo +# !hack hack hack! +# Can't use YaST _macro for marking strings +# for translation, so we need to do it Perl-way setlocale(LC_MESSAGES, ""); +my $dom = Locale::gettext->domain("yast2-apparmor"); +$dom->dir("/usr/share/YaST2/locale"); textdomain("yast2-apparmor"); setup_yast(); @@ -40,17 +45,16 @@ # tell 'em how to use it... &usage && exit if $help; - my $sd_mountpoint = check_for_subdomain(); unless($sd_mountpoint) { - fatal_error(gettext("SubDomain does not appear to be started. Please enable SubDomain and try again.")); + fatal_error( decode("utf8", gettext("SubDomain does not appear to be started. Please enable SubDomain and try again."))); } # let's convert it to full path... $profiledir = get_full_path($profiledir); unless(-d $profiledir) { - fatal_error(sprintf(gettext("Can't find subdomain profiles in %s."), $profiledir)); + fatal_error( decode("utf8", sprintf(gettext("Can't find subdomain profiles in %s."), $profiledir))); } # what are we profiling? @@ -62,18 +66,18 @@ my $f = { description => -gettext("This wizard will help you create a new AppArmor security +decode( "utf8", gettext("This wizard will help you create a new AppArmor security profile for an application, or you can use it to enhance an existing profile by allowing AppArmor to learn new application behavior. Please enter the application name for which you would like to create a profile, or select Browse to find the -application on your system."), - file_label => gettext("&Application to Profile"), - okay_label => gettext("&Create"), - cancel_label => gettext("&Abort"), - browse_desc => gettext("Select Program to Profile"), +application on your system.") ), + file_label => decode("utf8", gettext("&Application to Profile")), + okay_label => decode("utf8", gettext("&Create")), + cancel_label => decode ("utf8", gettext("&Abort")), + browse_desc => decode("utf8", gettext("Select Program to Profile")), }; my $profiling = UI_GetFile( $f ); @@ -92,18 +96,18 @@ chomp($fqdbin); unless(-x $fqdbin) { - UI_Important(gettext("The specified file is not executable. + UI_Important( decode("utf8", gettext("The specified file is not executable. Please enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard."))); } } elsif(-d $profiling) { - UI_Important(gettext("The specified pathname is a directory. + UI_Important( decode("utf8", gettext("The specified pathname is a directory. Please enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard."))); } else { if($profiling !~ /\//) { my $which = which($profiling); @@ -113,22 +117,22 @@ } unless(-f $fqdbin) { - UI_Important(gettext("The specified file does not exist. + UI_Important( decode("utf8", gettext("The specified file does not exist. Please enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard."))); } } } else { # they hit okay without entering anything - UI_Important(gettext("You have not entered or selected an + UI_Important( decode("utf8", gettext("You have not entered or selected an application to profile. Please enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard."))); } } until($fqdbin && -x $fqdbin); @@ -170,8 +174,8 @@ } my $q = { }; - $q->{headers} = [ gettext("Profiling"), $fqdbin ]; - $q->{explanation} = gettext("Please start the application to be profiled in + $q->{headers} = [ decode("utf8", gettext("Profiling")), $fqdbin ]; + $q->{explanation} = decode("utf8", gettext("Please start the application to be profiled in another window and exercise its functionality now. Once completed, select the 'Scan' option below in @@ -179,7 +183,7 @@ For each AppArmor event, you will be given the opportunity to choose whether the access should be -allowed or denied."); +allowed or denied.")); $q->{functions} = [ "CMD_SCAN", "CMD_FINISHED" ]; $q->{default} = "CMD_SCAN"; @@ -195,7 +199,7 @@ } else { # make them confirm the exit command - my $ans = UI_YesNo(gettext("Are you sure you want to exit?"), "n"); + my $ans = UI_YesNo( decode("utf8", gettext("Are you sure you want to exit?")), "n"); if($ans eq "y") { $done_profiling = 1; } @@ -218,8 +222,8 @@ } } -UI_Info(gettext("Reloaded SubDomain profiles in enforce mode.")); -UI_Info(sprintf(gettext('Finished generating profile for %s.'), $fqdbin)); +UI_Info(decode("utf8", gettext("Reloaded SubDomain profiles in enforce mode."))); +UI_Info(decode("utf8", sprintf(gettext('Finished generating profile for %s.'), $fqdbin))); shutdown_yast(); Modified: trunk/apparmor/src/agents/ag_logparse URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_logparse?… ============================================================================== --- trunk/apparmor/src/agents/ag_logparse (original) +++ trunk/apparmor/src/agents/ag_logparse Fri Nov 28 17:50:49 2008 @@ -39,6 +39,9 @@ use Immunix::Reports; +#FIXME: I don't know whether localizable strings +#from this agent are visible somewhere in UI, so possibly +#gettext include could be removed setlocale(LC_MESSAGES, ""); textdomain("yast2-apparmor"); Modified: trunk/apparmor/src/agents/ag_reports_confined URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_reports_c… ============================================================================== --- trunk/apparmor/src/agents/ag_reports_confined (original) +++ trunk/apparmor/src/agents/ag_reports_confined Fri Nov 28 17:50:49 2008 @@ -14,6 +14,9 @@ use POSIX; use ycp; +#FIXME: I don't know whether localizable strings +#from this agent are visible somewhere in UI, so possibly +#gettext include could be removed setlocale(LC_MESSAGES, ""); textdomain("yast2-apparmor"); Modified: trunk/apparmor/src/agents/ag_reports_sched URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_reports_s… ============================================================================== --- trunk/apparmor/src/agents/ag_reports_sched (original) +++ trunk/apparmor/src/agents/ag_reports_sched Fri Nov 28 17:50:49 2008 @@ -42,6 +42,9 @@ use Immunix::Reports; +#FIXME:gettext is used in this agent but could be as well dropped +#as the translatable messages go into y2log only, so it does +#not hurt if they are not localized setlocale(LC_MESSAGES, ""); textdomain("yast2-apparmor"); -- 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] r53739 - in /trunk/qt-pkg/src: YQPkgChangesDialog.cc YQPkgChangesDialog.h
by dmacvicar＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: dmacvicar Date: Fri Nov 28 17:40:35 2008 New Revision: 53739 URL: http://svn.opensuse.org/viewcvs/yast?rev=53739&view=rev Log: - of course, we can research what is new in Qt 4.x and stop making mappings between gui and data, when one has a nice way to store user data as QVariants. Something that the whole Qt UI could benefit from. Strange that findData() function does not seem to work with our custom type, however a normal loop, works. Modified: trunk/qt-pkg/src/YQPkgChangesDialog.cc trunk/qt-pkg/src/YQPkgChangesDialog.h Modified: trunk/qt-pkg/src/YQPkgChangesDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgChangesDialog.cc… ============================================================================== --- trunk/qt-pkg/src/YQPkgChangesDialog.cc (original) +++ trunk/qt-pkg/src/YQPkgChangesDialog.cc Fri Nov 28 17:40:35 2008 @@ -89,13 +89,12 @@ _filter = new QComboBox(this); // add the items. - _filter->addItems( QStringList() << _("All") - << _("Selected by the user") - << _("Automatic Changes") ); + _filter->addItem(_("All"), QVariant::fromValue(Filters(FilterAll))); + _filter->addItem(_("Selected by the user"), QVariant::fromValue(Filters(FilterUser))); + _filter->addItem(_("Automatic Changes"), QVariant::fromValue(Filters(FilterAutomatic))); _filter->setCurrentIndex(0); - layout->addWidget(_filter); connect( _filter, SIGNAL(currentIndexChanged(int)), SLOT(slotFilterChanged(int))); @@ -142,42 +141,6 @@ } } -YQPkgChangesDialog::Filters -YQPkgChangesDialog::indexToFilter( int i ) const -{ - switch (i) - { - case FilterIndexUser: - return FilterUser; - case FilterIndexAutomatic: - return FilterAutomatic; - case FilterIndexAll: - default: - return FilterAll; - } - return FilterAll; -} - -int -YQPkgChangesDialog::filterToIndex( Filters f ) const -{ - switch (f) - { - case FilterAll: - return FilterIndexAll; - case FilterUser: - return FilterIndexUser; - case FilterAutomatic: - return FilterIndexAutomatic; - default: - return FilterIndexAll; - } - - return FilterIndexAll; -} - - - void YQPkgChangesDialog::filter( Filters f ) { @@ -188,8 +151,18 @@ YQPkgChangesDialog::slotFilterChanged( int index ) { yuiMilestone() << "filter index changed to: " << index << endl; - Filters f = indexToFilter(index); - filter(f); + QVariant v = _filter->itemData(index); + + if ( v.isValid() && v.canConvert<Filters>() ) + { + Filters f = v.value<Filters>(); + filter(f); + } + else + { + yuiError() << "Can't find filter for index " << index << endl; + } + } void @@ -201,16 +174,34 @@ void YQPkgChangesDialog::setFilter( const QRegExp &regexp, Filters f ) { - int index = filterToIndex(f); - yuiMilestone() << "filter changed to: " << f << ", index: " << index << endl; - // so we dont get called again - _filter->blockSignals(true); - - // try to set the widget - _filter->setCurrentIndex(f); + yuiMilestone() << "filter changed to: " << f << endl; - _filter->blockSignals(false); - filter(regexp, f); + int index = -1; + for ( int k = 0; k < _filter->count(); ++k ) + { + QVariant v = _filter->itemData(k); + if ( v.isValid() && v.canConvert<Filters>() ) + { + + Filters setf = v.value<Filters>(); + if ( setf == f ) + index = k; + } + } + + if ( index != -1 ) + { + // so we dont get called again + _filter->blockSignals(true); + // try to set the widget + _filter->setCurrentIndex(f); + _filter->blockSignals(false); + filter(regexp, f); + } + else + { + yuiError() << "Can't find index for filter " << f << endl; + } } Modified: trunk/qt-pkg/src/YQPkgChangesDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgChangesDialog.h?… ============================================================================== --- trunk/qt-pkg/src/YQPkgChangesDialog.h (original) +++ trunk/qt-pkg/src/YQPkgChangesDialog.h Fri Nov 28 17:40:35 2008 @@ -138,16 +138,6 @@ void slotFilterChanged( int index ); protected: - - /** - * convert filter index into a filter combination - */ - Filters indexToFilter( int i ) const; - /** - * Filter to combobox index - */ - int filterToIndex( Filters f ) const; - /** * Constructor: Creates a changes dialog with text 'message' on * top, a list packages with an "auto" status that is not set via selections -- 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] r53738 - in /trunk/apparmor/src/agents: ag_complain ag_logprof ag_sd_config ag_subdomain
by kmachalkova＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: kmachalkova Date: Fri Nov 28 17:35:36 2008 New Revision: 53738 URL: http://svn.opensuse.org/viewcvs/yast?rev=53738&view=rev Log: Dropped Locale::gettext include, as no strings are translated here Modified: trunk/apparmor/src/agents/ag_complain trunk/apparmor/src/agents/ag_logprof trunk/apparmor/src/agents/ag_sd_config trunk/apparmor/src/agents/ag_subdomain Modified: trunk/apparmor/src/agents/ag_complain URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_complain?… ============================================================================== --- trunk/apparmor/src/agents/ag_complain (original) +++ trunk/apparmor/src/agents/ag_complain Fri Nov 28 17:35:36 2008 @@ -31,15 +31,10 @@ ################################################################################ use strict; -use Locale::gettext; -use POSIX; use ycp; use Immunix::SubDomain; -setlocale(LC_MESSAGES, ""); -textdomain("yast2-apparmor"); - our $UI_Mode = "yast-agent"; sub getProfPath ($) { Modified: trunk/apparmor/src/agents/ag_logprof URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_logprof?r… ============================================================================== --- trunk/apparmor/src/agents/ag_logprof (original) +++ trunk/apparmor/src/agents/ag_logprof Fri Nov 28 17:35:36 2008 @@ -15,8 +15,6 @@ use strict; use Data::Dumper; use Getopt::Long; -use Locale::gettext; -use POSIX; use Immunix::SubDomain; @@ -25,10 +23,6 @@ exit 0; } -# initialize the local poo -setlocale(LC_MESSAGES, ""); -textdomain("yast2-apparmor"); - setup_yast(); # options variables Modified: trunk/apparmor/src/agents/ag_sd_config URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_sd_config… ============================================================================== --- trunk/apparmor/src/agents/ag_sd_config (original) +++ trunk/apparmor/src/agents/ag_sd_config Fri Nov 28 17:35:36 2008 @@ -17,15 +17,10 @@ use strict; use ycp; use Data::Dumper; -use Locale::gettext; -use POSIX; use Immunix::Notify; use Immunix::Reports; -setlocale(LC_MESSAGES, ""); -textdomain("yast2-apparmor"); - # Subroutines ################################################################################ sub setSubdomain { Modified: trunk/apparmor/src/agents/ag_subdomain URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_subdomain… ============================================================================== --- trunk/apparmor/src/agents/ag_subdomain (original) +++ trunk/apparmor/src/agents/ag_subdomain Fri Nov 28 17:35:36 2008 @@ -20,14 +20,9 @@ use strict; use ycp; use Data::Dumper; -use Locale::gettext; -use POSIX; use Immunix::Notify; use Immunix::SubDomain; -setlocale(LC_MESSAGES, ""); -textdomain("yast2-apparmor"); - # Subroutines ################################################################################ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0