April 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r61560 - in /trunk/users: VERSION package/yast2-users.changes src/Users.pm testsuite/tests/YaPIGroupAdd.out testsuite/tests/YaPIGroupAdd.ycp
by jsuchome＠svn.opensuse.org 01 Apr '10

01 Apr '10

Author: jsuchome Date: Thu Apr 1 13:18:44 2010 New Revision: 61560 URL: http://svn.opensuse.org/viewcvs/yast?rev=61560&view=rev Log: - check user existence before adding to the group (bnc#592223) - 2.19.10 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/Users.pm trunk/users/testsuite/tests/YaPIGroupAdd.out trunk/users/testsuite/tests/YaPIGroupAdd.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=61560&r1=61559… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Thu Apr 1 13:18:44 2010 @@ -1 +1 @@ -2.19.9 +2.19.10 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Thu Apr 1 13:18:44 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 1 12:58:05 CEST 2010 - jsuchome(a)suse.cz + +- check user existence before adding to the group (bnc#592223) +- 2.19.10 + +------------------------------------------------------------------- Tue Mar 30 16:10:13 CEST 2010 - jsuchome(a)suse.cz - change home directory onwer in case of GID change (bnc#592229) Modified: trunk/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=61560&r1=… ============================================================================== --- trunk/users/src/Users.pm (original) +++ trunk/users/src/Users.pm Thu Apr 1 13:18:44 2010 @@ -5505,6 +5505,16 @@ $error = $self->CheckGroupname ($group{"cn"}); } + if ($error eq "") { + my %userlist = (); + if (defined $group{"userlist"}) { + %userlist = %{$group{"userlist"}}; + } + foreach my $user (keys %userlist) { + my %u = %{$self->GetUserByName ($user, "")}; + $error = sprintf (__("User %s does not exist."), $user) unless %u; + } + } my $error_map = UsersPlugins->Apply ("Check", { "what" => "group", Modified: trunk/users/testsuite/tests/YaPIGroupAdd.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/YaPIGroupA… ============================================================================== --- trunk/users/testsuite/tests/YaPIGroupAdd.out (original) +++ trunk/users/testsuite/tests/YaPIGroupAdd.out Thu Apr 1 13:18:44 2010 @@ -35,7 +35,7 @@ Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true Execute .target.bash_output "echo 'gg2' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"gg2"] Execute .target.bash "/bin/cp /etc/group /etc/group.YaST2save" 0 -Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh1,hh2\nusers:x:100:\n+:::\n" true +Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh\nusers:x:100:\n+:::\n" true Execute .target.bash_output "diff -U 1 /etc/group.YaST2save /etc/group" $["stdout":"gg2"] Execute .target.bash "/usr/sbin/nscd -i group" 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $["custom_groups":["local"], "custom_users":["local"], "dont_warn_when_nisserver_notdes":false, "dont_warn_when_uppercase":false] true @@ -55,12 +55,27 @@ Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true Execute .target.bash_output "echo 'gg3' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"gg3"] Execute .target.bash "/bin/cp /etc/group /etc/group.YaST2save" 0 -Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh1,hh2\ngg3:x:1002:hh1,hh2\nusers:x:100:\n+:::\n" true +Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh\ngg3:x:1002:hh,ii\nusers:x:100:\n+:::\n" true Execute .target.bash_output "diff -U 1 /etc/group.YaST2save /etc/group" $["stdout":"gg3"] Execute .target.bash "/usr/sbin/nscd -i group" 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $["custom_groups":["local"], "custom_users":["local"], "dont_warn_when_nisserver_notdes":false, "dont_warn_when_uppercase":false] true Return Dump ============ add new group 'gg3' - done ==================== +Dump ============ add new group 'gg4' with non existent user == +Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."group" 100 +Read .etc.default.useradd."groups" "audio,video" +Read .etc.default.useradd."home" "/tmp/local/home" +Read .etc.default.useradd."inactive" 0 +Read .etc.default.useradd."shell" 0 +Read .etc.default.useradd."skel" 0 +Read .target.string "/etc/shells" 0 +Read .etc.nsswitch_conf.passwd 0 +Read .etc.nsswitch_conf.passwd 0 +Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true +Execute .target.bash_output "echo 'gg4' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"gg4"] +Return User hh2 does not exist. +Dump ============ add new group 'gg4' - done ==================== Dump ============ add new group 'root' (groupname conflict): ====== Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Modified: trunk/users/testsuite/tests/YaPIGroupAdd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/YaPIGroupA… ============================================================================== --- trunk/users/testsuite/tests/YaPIGroupAdd.ycp (original) +++ trunk/users/testsuite/tests/YaPIGroupAdd.ycp Thu Apr 1 13:18:44 2010 @@ -84,7 +84,7 @@ Testsuite::Dump ("============ add new group 'gg' - done ===================="); - data_map ["userlist"] = [ "hh1", "hh2" ]; + data_map ["userlist"] = [ "hh" ]; data_map ["cn"] = "gg2"; E ["target", "bash_output", "stdout"] = "gg2"; @@ -93,8 +93,8 @@ Testsuite::Dump ("============ add new group 'gg2' - done ===================="); data_map ["userlist"] = $[ - "hh1" : 1, - "hh2" : 1 + "hh" : 1, + "ii" : 1 ]; data_map ["cn"] = "gg3"; E ["target", "bash_output", "stdout"] = "gg3"; @@ -103,6 +103,16 @@ Testsuite::Test (``(YaPI::USERS::GroupAdd (config_map, data_map)), [R,W,E], 0); Testsuite::Dump ("============ add new group 'gg3' - done ===================="); + data_map ["userlist"] = $[ + "hh2" : 1, + ]; + data_map ["cn"] = "gg4"; + E ["target", "bash_output", "stdout"] = "gg4"; + + Testsuite::Dump ("============ add new group 'gg4' with non existent user =="); + Testsuite::Test (``(YaPI::USERS::GroupAdd (config_map, data_map)), [R,W,E], 0); + Testsuite::Dump ("============ add new group 'gg4' - done ===================="); + Testsuite::Dump ("============ add new group 'root' (groupname conflict): ======"); data_map = $[ -- 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] r61559 - /tags/branch-Code-11-SP1-2_17_40/users/
by jsuchome＠svn.opensuse.org 01 Apr '10

01 Apr '10

Author: jsuchome Date: Thu Apr 1 13:18:38 2010 New Revision: 61559 URL: http://svn.opensuse.org/viewcvs/yast?rev=61559&view=rev Log: Created tag branch-Code-11-SP1-2_17_40 for users Added: tags/branch-Code-11-SP1-2_17_40/users/ (props changed) - copied from r61558, branches/SuSE-Code-11-SP1-Branch/users/ -- 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] r61558 - in /branches/SuSE-Code-11-SP1-Branch/users: VERSION package/yast2-users.changes src/Users.pm testsuite/tests/YaPIGroupAdd.out testsuite/tests/YaPIGroupAdd.ycp
by jsuchome＠svn.opensuse.org 01 Apr '10

01 Apr '10

Author: jsuchome Date: Thu Apr 1 13:18:10 2010 New Revision: 61558 URL: http://svn.opensuse.org/viewcvs/yast?rev=61558&view=rev Log: - check user existence before adding to the group (bnc#592223) - 2.17.40 Modified: branches/SuSE-Code-11-SP1-Branch/users/VERSION branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes branches/SuSE-Code-11-SP1-Branch/users/src/Users.pm branches/SuSE-Code-11-SP1-Branch/users/testsuite/tests/YaPIGroupAdd.out branches/SuSE-Code-11-SP1-Branch/users/testsuite/tests/YaPIGroupAdd.ycp Modified: branches/SuSE-Code-11-SP1-Branch/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/users/VERSION Thu Apr 1 13:18:10 2010 @@ -1 +1 @@ -2.17.39 +2.17.40 Modified: branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes Thu Apr 1 13:18:10 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 1 12:57:31 CEST 2010 - jsuchome(a)suse.cz + +- check user existence before adding to the group (bnc#592223) +- 2.17.40 + +------------------------------------------------------------------- Tue Mar 30 16:09:23 CEST 2010 - jsuchome(a)suse.cz - change home directory onwer in case of GID change (bnc#592229) Modified: branches/SuSE-Code-11-SP1-Branch/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/src/Users.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/users/src/Users.pm Thu Apr 1 13:18:10 2010 @@ -5541,6 +5541,16 @@ $error = $self->CheckGroupname ($group{"cn"}); } + if ($error eq "") { + my %userlist = (); + if (defined $group{"userlist"}) { + %userlist = %{$group{"userlist"}}; + } + foreach my $user (keys %userlist) { + my %u = %{$self->GetUserByName ($user, "")}; + $error = sprintf (__("User %s does not exist."), $user) unless %u; + } + } my $error_map = UsersPlugins->Apply ("Check", { "what" => "group", Modified: branches/SuSE-Code-11-SP1-Branch/users/testsuite/tests/YaPIGroupAdd.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/testsuite/tests/YaPIGroupAdd.out (original) +++ branches/SuSE-Code-11-SP1-Branch/users/testsuite/tests/YaPIGroupAdd.out Thu Apr 1 13:18:10 2010 @@ -34,7 +34,7 @@ Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true Execute .target.bash_output "echo 'gg2' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"gg2"] Execute .target.bash "/bin/cp /etc/group /etc/group.YaST2save" 0 -Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh1,hh2\nusers:x:100:\n+:::\n" true +Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh\nusers:x:100:\n+:::\n" true Execute .target.bash "/usr/sbin/nscd -i group" 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $["custom_groups":["local"], "custom_users":["local"], "dont_warn_when_nisserver_notdes":false, "dont_warn_when_uppercase":false] true Return @@ -53,11 +53,26 @@ Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true Execute .target.bash_output "echo 'gg3' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"gg3"] Execute .target.bash "/bin/cp /etc/group /etc/group.YaST2save" 0 -Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh1,hh2\ngg3:x:1002:hh1,hh2\nusers:x:100:\n+:::\n" true +Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh\ngg3:x:1002:hh,ii\nusers:x:100:\n+:::\n" true Execute .target.bash "/usr/sbin/nscd -i group" 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $["custom_groups":["local"], "custom_users":["local"], "dont_warn_when_nisserver_notdes":false, "dont_warn_when_uppercase":false] true Return Dump ============ add new group 'gg3' - done ==================== +Dump ============ add new group 'gg4' with non existent user == +Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."group" 100 +Read .etc.default.useradd."groups" "audio,video" +Read .etc.default.useradd."home" "/tmp/local/home" +Read .etc.default.useradd."inactive" 0 +Read .etc.default.useradd."shell" 0 +Read .etc.default.useradd."skel" 0 +Read .target.string "/etc/shells" 0 +Read .etc.nsswitch_conf.passwd 0 +Read .etc.nsswitch_conf.passwd 0 +Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true +Execute .target.bash_output "echo 'gg4' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"gg4"] +Return User hh2 does not exist. +Dump ============ add new group 'gg4' - done ==================== Dump ============ add new group 'root' (groupname conflict): ====== Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Modified: branches/SuSE-Code-11-SP1-Branch/users/testsuite/tests/YaPIGroupAdd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/testsuite/tests/YaPIGroupAdd.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/users/testsuite/tests/YaPIGroupAdd.ycp Thu Apr 1 13:18:10 2010 @@ -84,7 +84,7 @@ Testsuite::Dump ("============ add new group 'gg' - done ===================="); - data_map ["userlist"] = [ "hh1", "hh2" ]; + data_map ["userlist"] = [ "hh" ]; data_map ["cn"] = "gg2"; E ["target", "bash_output", "stdout"] = "gg2"; @@ -93,8 +93,8 @@ Testsuite::Dump ("============ add new group 'gg2' - done ===================="); data_map ["userlist"] = $[ - "hh1" : 1, - "hh2" : 1 + "hh" : 1, + "ii" : 1 ]; data_map ["cn"] = "gg3"; E ["target", "bash_output", "stdout"] = "gg3"; @@ -103,6 +103,16 @@ Testsuite::Test (``(YaPI::USERS::GroupAdd (config_map, data_map)), [R,W,E], 0); Testsuite::Dump ("============ add new group 'gg3' - done ===================="); + data_map ["userlist"] = $[ + "hh2" : 1, + ]; + data_map ["cn"] = "gg4"; + E ["target", "bash_output", "stdout"] = "gg4"; + + Testsuite::Dump ("============ add new group 'gg4' with non existent user =="); + Testsuite::Test (``(YaPI::USERS::GroupAdd (config_map, data_map)), [R,W,E], 0); + Testsuite::Dump ("============ add new group 'gg4' - done ===================="); + Testsuite::Dump ("============ add new group 'root' (groupname conflict): ======"); data_map = $[ -- 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] r61557 - /trunk/slide-show/package/yast2-slide-show.changes
by keichwa＠svn.opensuse.org 01 Apr '10

01 Apr '10

Author: keichwa Date: Thu Apr 1 11:37:06 2010 New Revision: 61557 URL: http://svn.opensuse.org/viewcvs/yast?rev=61557&view=rev Log: add missing entries Modified: trunk/slide-show/package/yast2-slide-show.changes Modified: trunk/slide-show/package/yast2-slide-show.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/slide-show/package/yast2-slide-s… ============================================================================== --- trunk/slide-show/package/yast2-slide-show.changes (original) +++ trunk/slide-show/package/yast2-slide-show.changes Thu Apr 1 11:37:06 2010 @@ -11,6 +11,28 @@ - disable parallel build ------------------------------------------------------------------- +Thu Oct 29 11:19:23 CET 2009 - ke(a)suse.de + +- Update translations for openSUSE 11.2 RC2. + +------------------------------------------------------------------- +Fri Oct 9 09:57:33 CEST 2009 - ke(a)suse.de + +- Update translations for openSUSE 11.2 RC1. + +------------------------------------------------------------------- +Thu Sep 24 15:36:21 CEST 2009 - ke(a)suse.de + +- Update translations for openSUSE 11.2 M8.. + +------------------------------------------------------------------- +Wed Sep 16 10:36:39 CEST 2009 - ke(a)suse.de + +- 2.18.3: +- Increate version number; bnc#539275. +- Update translations. + +------------------------------------------------------------------- Tue Jul 7 14:00:17 CEST 2009 - ke(a)suse.de - 2.18.2: -- 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] r61556 - /tags/stable-2_21_31/gtk/
by rpmcruz＠svn.opensuse.org 01 Apr '10

01 Apr '10

Author: rpmcruz Date: Thu Apr 1 05:42:00 2010 New Revision: 61556 URL: http://svn.opensuse.org/viewcvs/yast?rev=61556&view=rev Log: Created tag stable-2_21_31 for gtk Added: tags/stable-2_21_31/gtk/ - copied from r61555, 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] r61555 - /tags/stable-2_21_31/
by rpmcruz＠svn.opensuse.org 01 Apr '10

01 Apr '10

Author: rpmcruz Date: Thu Apr 1 05:41:53 2010 New Revision: 61555 URL: http://svn.opensuse.org/viewcvs/yast?rev=61555&view=rev Log: Created tag stable-2_21_31 Added: tags/stable-2_21_31/ -- 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] r61554 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 01 Apr '10

01 Apr '10

Author: rpmcruz Date: Thu Apr 1 05:41:51 2010 New Revision: 61554 URL: http://svn.opensuse.org/viewcvs/yast?rev=61554&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=61554&r1=61553&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Thu Apr 1 05:41:51 2010 @@ -1 +1 @@ -2.21.30 +2.21.31 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=61554&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Thu Apr 1 05:41:51 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "30") +SET(VERSION_PATCH "31") 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 Thu Apr 1 05:41:51 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 01 04:42:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.31 +- sw_single: added history of changes dialog. +- sw_single: align side-bar count number to the right. + +------------------------------------------------------------------- Thu Mar 25 18:54:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.30 -- 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] r61553 - in /trunk/gtk: ChangeLog src/pkg/ygtkpkgdetailview.cc src/pkg/ygtkpkghistorydialog.cc
by rpmcruz＠svn.opensuse.org 01 Apr '10

01 Apr '10

Author: rpmcruz Date: Thu Apr 1 05:40:23 2010 New Revision: 61553 URL: http://svn.opensuse.org/viewcvs/yast?rev=61553&view=rev Log: * src/pkg/ygtkpkghistorydialog.cc: set dialog non-modal. * src/pkg/ygtkpkgdetailview.cc: added line to changelog indicating it only applies to the installed version. Modified: trunk/gtk/ChangeLog trunk/gtk/src/pkg/ygtkpkgdetailview.cc trunk/gtk/src/pkg/ygtkpkghistorydialog.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=61553&r1=61552… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Apr 1 05:40:23 2010 @@ -9,6 +9,11 @@ * src/pkg/YGPackageSelector.cc: aligned tool-box to the right, and re-positioned it, as requested by Atri. + * src/pkg/ygtkpkghistorydialog.cc: set dialog non-modal. + + * src/pkg/ygtkpkgdetailview.cc: added line to changelog + indicating it only applies to the installed version. + 2010-03-31 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkpkghistorydialog.h/cc: fate#305859 and 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 Thu Apr 1 05:40:23 2010 @@ -958,6 +958,8 @@ static std::string changelog (Ypp::Selectable &sel) { std::string text; + text.reserve (32768); + text = _("<p>Changelog applies only to the installed version.</p>"); ZyppResObject zobj = sel.installed().zyppObj(); ZyppPackage zpkg = castZyppPackage (zobj); if (zpkg) { Modified: trunk/gtk/src/pkg/ygtkpkghistorydialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkghistorydialog… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkghistorydialog.cc (original) +++ trunk/gtk/src/pkg/ygtkpkghistorydialog.cc Thu Apr 1 05:40:23 2010 @@ -127,10 +127,40 @@ GtkTextTag *bold_tag; }; +static void write_file (const char *filename, const char *text) +{ + FILE *file = fopen (filename, "w"); + fwrite (text, strlen (text), sizeof (char), file); + fclose (file); +} + +static void response_cb (GtkDialog *dialog, gint response, GtkTextBuffer *buffer) +{ + if (response == 1) { + GtkWidget *_dialog = gtk_file_chooser_dialog_new ("", GTK_WINDOW (dialog), + GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_OPEN, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (_dialog), TRUE); + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (_dialog), TRUE); + if (gtk_dialog_run (GTK_DIALOG (_dialog)) == GTK_RESPONSE_OK) { + gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (_dialog)); + GtkTextIter start, end; + gtk_text_buffer_get_bounds (buffer, &start, &end); + gchar *text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE); + write_file (filename, text); + g_free (text); + g_free (filename); + } + gtk_widget_destroy (_dialog); + } + else + gtk_widget_destroy (GTK_WIDGET (dialog)); +} YGtkPkgHistoryDialog::YGtkPkgHistoryDialog() { GtkWidget *text = ygtk_text_view_new (FALSE); + GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)); GtkWidget *text_scroll = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (text_scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -165,11 +195,15 @@ gtk_container_add (GTK_CONTAINER (date_scroll), date_view); GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GtkDialogFlags (0), GTK_MESSAGE_OTHER, GTK_BUTTONS_CLOSE, _("History of Changes")); + GtkDialogFlags (0), GTK_MESSAGE_OTHER, GTK_BUTTONS_NONE, _("History of Changes")); +// gtk_dialog_add_button (GTK_DIALOG (dialog), _("Save to file"), 1); + gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_DELETE_EVENT); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), FILENAME); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 500); + g_signal_connect (G_OBJECT (dialog), "response", + G_CALLBACK (response_cb), buffer); GtkWidget *hpaned = gtk_hpaned_new(); gtk_paned_pack1 (GTK_PANED (hpaned), date_scroll, FALSE, FALSE); @@ -177,7 +211,7 @@ gtk_paned_set_position (GTK_PANED (hpaned), 180); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hpaned); - Handler handler (store, gtk_text_view_get_buffer (GTK_TEXT_VIEW (text))); + Handler handler (store, buffer); zypp::parser::HistoryLogReader parser (FILENAME, boost::ref (handler)); try { parser.readAll(); @@ -192,8 +226,8 @@ } YGtkPkgHistoryDialog::~YGtkPkgHistoryDialog() -{ gtk_widget_destroy (m_dialog); } +{} //gtk_widget_destroy (m_dialog); } void YGtkPkgHistoryDialog::popup() -{ gtk_dialog_run (GTK_DIALOG (m_dialog)); } +{ gtk_widget_show (m_dialog); } -- 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] r61552 - in /trunk/gtk: ChangeLog src/pkg/YGPackageSelector.cc src/pkg/ygtkpkgfilterview.cc src/pkg/ygtkpkgfilterview.h src/pkg/ygtkpkghistorydialog.cc src/ygtkrichtext.c
by rpmcruz＠svn.opensuse.org 01 Apr '10

01 Apr '10

Author: rpmcruz Date: Thu Apr 1 04:48:36 2010 New Revision: 61552 URL: http://svn.opensuse.org/viewcvs/yast?rev=61552&view=rev Log: * src/pkg/ygtkpkghistorydialog.cc: added some markup to the text as requested by Atri. * src/pkg/ygtkpkgfilterview.cc: aligned number count to the right. * src/pkg/YGPackageSelector.cc: aligned tool-box to the right, and re-positioned it, as requested by Atri. Modified: trunk/gtk/ChangeLog trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkpkgfilterview.cc trunk/gtk/src/pkg/ygtkpkgfilterview.h trunk/gtk/src/pkg/ygtkpkghistorydialog.cc trunk/gtk/src/ygtkrichtext.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=61552&r1=61551… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Apr 1 04:48:36 2010 @@ -1,3 +1,14 @@ +2010-04-01 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/ygtkpkghistorydialog.cc: added some markup + to the text as requested by Atri. + + * src/pkg/ygtkpkgfilterview.cc: aligned number count + to the right. + + * src/pkg/YGPackageSelector.cc: aligned tool-box to + the right, and re-positioned it, as requested by Atri. + 2010-03-31 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkpkghistorydialog.h/cc: fate#305859 and 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 Thu Apr 1 04:48:36 2010 @@ -123,19 +123,20 @@ GtkWidget *text = gtk_event_box_new(); gtk_container_add (GTK_CONTAINER (text), m_overview); + GtkWidget *list_vbox = gtk_vbox_new (FALSE, 4); + gtk_box_pack_start (GTK_BOX (list_vbox), m_list->getWidget(), TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (list_vbox), m_toolbox, FALSE, TRUE, 0); + GtkWidget *vpaned = gtk_vpaned_new(); - gtk_paned_pack1 (GTK_PANED (vpaned), m_list->getWidget(), TRUE, FALSE); + gtk_paned_pack1 (GTK_PANED (vpaned), list_vbox, TRUE, FALSE); gtk_paned_pack2 (GTK_PANED (vpaned), text, FALSE, TRUE); g_signal_connect_after (G_OBJECT (vpaned), "size-allocate", G_CALLBACK (vpaned_allocate_cb), this); - GtkWidget *vbox, *_vbox = gtk_vbox_new (FALSE, 0); + GtkWidget *_vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (_vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (_vbox), vpaned, TRUE, TRUE, 0); - vbox = gtk_vbox_new (FALSE, 8); - gtk_box_pack_start (GTK_BOX (vbox), _vbox, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (vbox), m_toolbox, FALSE, TRUE, 0); - return vbox; + return _vbox; } GtkWidget *createSidebar() @@ -477,7 +478,7 @@ g_list_free (children); if (toolbox) { - gtk_box_pack_start (GTK_BOX (m_toolbox), toolbox, FALSE, TRUE, 0); + gtk_box_pack_end (GTK_BOX (m_toolbox), toolbox, FALSE, TRUE, 0); gtk_widget_show (m_toolbox); } else Modified: trunk/gtk/src/pkg/ygtkpkgfilterview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgfilterview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgfilterview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgfilterview.cc Thu Apr 1 04:48:36 2010 @@ -67,7 +67,7 @@ gchar *text; UpdateData *data = (UpdateData *) _data; gpointer mdata; - gtk_tree_model_get (model, iter, YGtkPkgFilterModel::TEXT_ORI_COLUMN, &text, + gtk_tree_model_get (model, iter, YGtkPkgFilterModel::TEXT_COLUMN, &text, YGtkPkgFilterModel::DATA_COLUMN, &mdata, -1); bool separator = !(*text); @@ -120,7 +120,7 @@ GtkTreeIter iter; gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, ICON_COLUMN, pixbuf, TEXT_COLUMN, text, - TEXT_ORI_COLUMN, text, ENABLED_COLUMN, enabled, VISIBLE_COLUMN, TRUE, + COUNT_NUMBER_COLUMN, "", ENABLED_COLUMN, enabled, VISIBLE_COLUMN, TRUE, DATA_COLUMN, data, -1); if (pixbuf) g_object_unref (pixbuf); @@ -135,14 +135,10 @@ GtkTreeIter iter; gtk_tree_model_iter_nth_child (impl->model, &iter, NULL, row); - gchar *ori_text; - gtk_tree_model_get (impl->model, &iter, TEXT_ORI_COLUMN, &ori_text, -1); - - gchar *text = g_strdup_printf ("%s <small>(%d)</small>", ori_text, count); - gtk_list_store_set (store, &iter, TEXT_COLUMN, text, + gchar *str = g_strdup_printf ("%d", count); + gtk_list_store_set (store, &iter, COUNT_NUMBER_COLUMN, str, VISIBLE_COLUMN, !hide_if_zero || count > 0, -1); - g_free (ori_text); - g_free (text); + g_free (str); } // Status @@ -595,8 +591,16 @@ column = gtk_tree_view_column_new_with_attributes ( NULL, renderer, "markup", YGtkPkgFilterModel::TEXT_COLUMN, "sensitive", YGtkPkgFilterModel::ENABLED_COLUMN, NULL); - g_object_set (G_OBJECT (renderer), "ellipsize", - updates ? PANGO_ELLIPSIZE_MIDDLE : PANGO_ELLIPSIZE_END, NULL); + g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + gtk_tree_view_column_set_expand (column, TRUE); + gtk_tree_view_append_column (view, column); + + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes ( + NULL, renderer, "text", YGtkPkgFilterModel::COUNT_NUMBER_COLUMN, + "sensitive", YGtkPkgFilterModel::ENABLED_COLUMN, NULL); + g_object_set (G_OBJECT (renderer), "xalign", 1.0, "scale", PANGO_SCALE_SMALL, + "foreground", "#8c8c8c", NULL); gtk_tree_view_append_column (view, column); GtkTreeSelection *selection = gtk_tree_view_get_selection (view); Modified: trunk/gtk/src/pkg/ygtkpkgfilterview.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgfilterview.h?… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgfilterview.h (original) +++ trunk/gtk/src/pkg/ygtkpkgfilterview.h Thu Apr 1 04:48:36 2010 @@ -20,7 +20,7 @@ struct YGtkPkgFilterModel // abstract { - enum Column { ICON_COLUMN, TEXT_COLUMN, TEXT_ORI_COLUMN, + enum Column { ICON_COLUMN, TEXT_COLUMN, COUNT_NUMBER_COLUMN, VISIBLE_COLUMN, ENABLED_COLUMN, DATA_COLUMN, TOTAL_COLUMNS }; YGtkPkgFilterModel(); Modified: trunk/gtk/src/pkg/ygtkpkghistorydialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkghistorydialog… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkghistorydialog.cc (original) +++ trunk/gtk/src/pkg/ygtkpkghistorydialog.cc Thu Apr 1 04:48:36 2010 @@ -10,12 +10,12 @@ #include "YGDialog.h" #include "ygtkpkghistorydialog.h" #include <gtk/gtk.h> -#include "ygtkrichtext.h" +#include "ygtktextview.h" #include <zypp/parser/HistoryLogReader.h> #define FILENAME "/var/log/zypp/history" -static void selection_changed_cb (GtkTreeSelection *selection, YGtkRichText *text) +static void selection_changed_cb (GtkTreeSelection *selection, GtkTextView *text) { GtkTreeModel *model; GtkTreeIter iter; @@ -23,9 +23,9 @@ char *date; gtk_tree_model_get (model, &iter, 0, &date, -1); - GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)); + GtkTextBuffer *buffer = gtk_text_view_get_buffer (text); GtkTextMark *mark = gtk_text_buffer_get_mark (buffer, date); - gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (text), mark, 0, TRUE, 0, 0); + gtk_text_view_scroll_to_mark (text, mark, 0, TRUE, 0, 0); g_free (date); } } @@ -34,7 +34,12 @@ { Handler (GtkListStore *store, GtkTextBuffer *buffer) : store (store), buffer (buffer) - {} + { + bold_tag = gtk_text_buffer_create_tag (buffer, "bold", + "weight", PANGO_WEIGHT_BOLD, "foreground", "#5c5c5c", + "scale", PANGO_SCALE_LARGE, "pixels-below-lines", 6, + "pixels-above-lines", 6, NULL); + } bool operator() (const zypp::HistoryItem::Ptr &item) { @@ -52,7 +57,8 @@ 0, date.c_str(), -1); gtk_text_buffer_create_mark (buffer, date.c_str(), &text_iter, TRUE); - gtk_text_buffer_insert (buffer, &text_iter, (date + "\n").c_str(), -1); + gtk_text_buffer_insert_with_tags (buffer, &text_iter, + (date + "\n").c_str(), -1, bold_tag, NULL); } std::string line; @@ -118,12 +124,13 @@ GtkListStore *store; GtkTextBuffer *buffer; std::string date; + GtkTextTag *bold_tag; }; YGtkPkgHistoryDialog::YGtkPkgHistoryDialog() { - GtkWidget *text = ygtk_rich_text_new(); + GtkWidget *text = ygtk_text_view_new (FALSE); GtkWidget *text_scroll = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (text_scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -167,7 +174,7 @@ GtkWidget *hpaned = gtk_hpaned_new(); gtk_paned_pack1 (GTK_PANED (hpaned), date_scroll, FALSE, FALSE); gtk_paned_pack2 (GTK_PANED (hpaned), text_scroll, TRUE, FALSE); - gtk_paned_set_position (GTK_PANED (hpaned), 220); + gtk_paned_set_position (GTK_PANED (hpaned), 180); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hpaned); Handler handler (store, gtk_text_view_get_buffer (GTK_TEXT_VIEW (text))); Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=61552… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Thu Apr 1 04:48:36 2010 @@ -117,10 +117,6 @@ // 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 = 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; gboolean reverse = gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL; const char *left_margin = reverse ? "right-margin" : "left-margin"; @@ -128,24 +124,22 @@ 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, + "scale", PANGO_SCALE_XX_LARGE, "pixels-below-lines", 16, "foreground", "#5c5c5c", NULL); gtk_text_buffer_create_tag (buffer, "h2", "weight", PANGO_WEIGHT_ULTRABOLD, - "size", (int)(size * PANGO_SCALE_X_LARGE), "pixels-below-lines", 15, + "scale", PANGO_SCALE_X_LARGE, "pixels-below-lines", 15, "foreground", "#5c5c5c", NULL); gtk_text_buffer_create_tag (buffer, "h3", "weight", PANGO_WEIGHT_BOLD, - "size", (int)(size * PANGO_SCALE_LARGE), "pixels-below-lines", 14, + "scale", PANGO_SCALE_LARGE, "pixels-below-lines", 14, "foreground", "#5c5c5c", NULL); gtk_text_buffer_create_tag (buffer, "h4", "weight", PANGO_WEIGHT_SEMIBOLD, - "size", (int)(size * PANGO_SCALE_LARGE), "pixels-below-lines", 13, + "scale", PANGO_SCALE_LARGE, "pixels-below-lines", 13, "foreground", "#5c5c5c", NULL); gtk_text_buffer_create_tag (buffer, "h5", - "size", (int)(size * PANGO_SCALE_LARGE), "foreground", "#5c5c5c", NULL); + "scale", PANGO_SCALE_LARGE, "foreground", "#5c5c5c", NULL); gtk_text_buffer_create_tag (buffer, "p", "pixels-below-lines", 12, NULL); - gtk_text_buffer_create_tag (buffer, "big", - "size", (int)(size * PANGO_SCALE_LARGE), NULL); - gtk_text_buffer_create_tag (buffer, "small", - "size", (int)(size * PANGO_SCALE_SMALL), NULL); + gtk_text_buffer_create_tag (buffer, "big", "scale", PANGO_SCALE_LARGE, NULL); + gtk_text_buffer_create_tag (buffer, "small", "scale", PANGO_SCALE_SMALL, NULL); gtk_text_buffer_create_tag (buffer, "tt", "family", "monospace", NULL); gtk_text_buffer_create_tag (buffer, "pre", "family", "monospace", "paragraph-background", "#f0f0f0", left_margin, 16, right_margin, 20, NULL); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0