November 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <web-client> master : support only language which has support in SLE11 (bnc#557768)
by Josef Reidinger 27 Nov '09

27 Nov '09

ref: refs/heads/master commit 04805979f0f7bd41e5fc28f8c3bcdd930d9a90dc Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Nov 27 12:48:00 2009 +0100 support only language which has support in SLE11 (bnc#557768) --- webclient/package/yast2-webclient.changes | 6 ++++++ webclient/package/yast2-webclient.spec | 2 +- webclient/test/functional/lang_controller_test.rb | 12 +++++------- .../vendor/plugins/lang_helper/lib/lang_helper.rb | 16 ++++++++++++++-- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index 5057b34..15487fe 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 27 11:44:25 UTC 2009 - jreidinger(a)novell.com + +- show only SLE11 supported languages (bnc#557768) +- 0.0.26 + +------------------------------------------------------------------- Thu Nov 26 14:43:11 CET 2009 - schubi(a)suse.de - removed *.swp file, added .*.swp to .gitignore diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index b7bf97b..57ff506 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -17,7 +17,7 @@ PreReq: rubygem-gettext_rails License: LGPL v2.1;ASLv2.0 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.25 +Version: 0.0.26 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 diff --git a/webclient/test/functional/lang_controller_test.rb b/webclient/test/functional/lang_controller_test.rb index db20922..ef3dcf7 100644 --- a/webclient/test/functional/lang_controller_test.rb +++ b/webclient/test/functional/lang_controller_test.rb @@ -5,26 +5,24 @@ class LangController < ApplicationController end class LangControllerTest < ActionController::TestCase - SUPPORTED_LANG = [ "en_US", "en_GB", "cs_CZ", "de_DE" ] def setup @controller = LangController.new - I18n.supported_locales= SUPPORTED_LANG end def test_known_lang - @controller.locale.stubs(:language).returns("cs_CZ") - assert_equal "cs_CZ",(a)controller.current_locale + @controller.locale.stubs(:language).returns("es") + assert_equal "es",(a)controller.current_locale end def test_unsuported_lang - @controller.locale.stubs(:language).returns("pt_BR") + @controller.locale.stubs(:language).returns("af") #af is not supported now assert_equal "en_US",(a)controller.current_locale end def test_browser_lang - @controller.locale.stubs(:language).returns("en-gb") - assert_equal "en_GB",(a)controller.current_locale + @controller.locale.stubs(:language).returns("zh-cn") + assert_equal "zh_CN",(a)controller.current_locale end end diff --git a/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb b/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb index c4ad1a7..09b2478 100644 --- a/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb +++ b/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb @@ -24,6 +24,7 @@ module LangHelper 'uk' => 'Українська', 'vi' => 'Tiếng Việt', 'wa' => 'Walon', 'xh' => 'isiXhosa', 'zh_CN' => '简体中文', 'zh_TW' => '繁體中文', 'zu' => 'isiZulu'} + def current_locale_image return "/images/flags/#{locale.language}.png" end @@ -33,7 +34,7 @@ module LangHelper Rails.logger.info ("detected locale #{ret}") #find locale from existing one, translate if locale came from browser to current one, fallback to american english default = lambda{return "en_US"} #detect require something which response to call - ret = I18n.supported_locales.detect(default) { |k| ret.tr('-','_').downcase == k.downcase ? k : nil} + ret = supported_languages.detect(default) { |k| ret.tr('-','_').downcase == k.downcase ? k : nil} Rails.logger.info ("returned locale #{ret}") return ret end @@ -58,7 +59,7 @@ module LangHelper end def show_language - langs = I18n.supported_locales.sort + langs = supported_languages.sort ret = "<h4>" + _("Select locale") + "</h4>" langs.each_with_index do |lang, i| ret << link_to( language_name(lang), @@ -74,5 +75,16 @@ module LangHelper # flash[:notice] = _('Cookie "lang" is set: %s') % params["id"] redirect_to :back end + + #do not use this constant (only internal), use supported_languages method + SUPPORTED_LANGUAGE= [ + "ar","cs","de","es","en_US","fr","hu","it","ja","ko", + "nl","pl","pt_BR","ru","sv","zh_CN","zh_TW" + ] + def supported_languages + #TODO read from file if vendor want create own translations + #list is same as SLE11SP1 supported + return SUPPORTED_LANGUAGE + end end -- 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] <web-client> backgroud_patches_bnc550934 : support only language which has support in SLE11 (bnc#557768)
by Josef Reidinger 27 Nov '09

27 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit 04805979f0f7bd41e5fc28f8c3bcdd930d9a90dc Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Nov 27 12:48:00 2009 +0100 support only language which has support in SLE11 (bnc#557768) --- webclient/package/yast2-webclient.changes | 6 ++++++ webclient/package/yast2-webclient.spec | 2 +- webclient/test/functional/lang_controller_test.rb | 12 +++++------- .../vendor/plugins/lang_helper/lib/lang_helper.rb | 16 ++++++++++++++-- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index 5057b34..15487fe 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 27 11:44:25 UTC 2009 - jreidinger(a)novell.com + +- show only SLE11 supported languages (bnc#557768) +- 0.0.26 + +------------------------------------------------------------------- Thu Nov 26 14:43:11 CET 2009 - schubi(a)suse.de - removed *.swp file, added .*.swp to .gitignore diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index b7bf97b..57ff506 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -17,7 +17,7 @@ PreReq: rubygem-gettext_rails License: LGPL v2.1;ASLv2.0 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.25 +Version: 0.0.26 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 diff --git a/webclient/test/functional/lang_controller_test.rb b/webclient/test/functional/lang_controller_test.rb index db20922..ef3dcf7 100644 --- a/webclient/test/functional/lang_controller_test.rb +++ b/webclient/test/functional/lang_controller_test.rb @@ -5,26 +5,24 @@ class LangController < ApplicationController end class LangControllerTest < ActionController::TestCase - SUPPORTED_LANG = [ "en_US", "en_GB", "cs_CZ", "de_DE" ] def setup @controller = LangController.new - I18n.supported_locales= SUPPORTED_LANG end def test_known_lang - @controller.locale.stubs(:language).returns("cs_CZ") - assert_equal "cs_CZ",(a)controller.current_locale + @controller.locale.stubs(:language).returns("es") + assert_equal "es",(a)controller.current_locale end def test_unsuported_lang - @controller.locale.stubs(:language).returns("pt_BR") + @controller.locale.stubs(:language).returns("af") #af is not supported now assert_equal "en_US",(a)controller.current_locale end def test_browser_lang - @controller.locale.stubs(:language).returns("en-gb") - assert_equal "en_GB",(a)controller.current_locale + @controller.locale.stubs(:language).returns("zh-cn") + assert_equal "zh_CN",(a)controller.current_locale end end diff --git a/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb b/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb index c4ad1a7..09b2478 100644 --- a/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb +++ b/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb @@ -24,6 +24,7 @@ module LangHelper 'uk' => 'Українська', 'vi' => 'Tiếng Việt', 'wa' => 'Walon', 'xh' => 'isiXhosa', 'zh_CN' => '简体中文', 'zh_TW' => '繁體中文', 'zu' => 'isiZulu'} + def current_locale_image return "/images/flags/#{locale.language}.png" end @@ -33,7 +34,7 @@ module LangHelper Rails.logger.info ("detected locale #{ret}") #find locale from existing one, translate if locale came from browser to current one, fallback to american english default = lambda{return "en_US"} #detect require something which response to call - ret = I18n.supported_locales.detect(default) { |k| ret.tr('-','_').downcase == k.downcase ? k : nil} + ret = supported_languages.detect(default) { |k| ret.tr('-','_').downcase == k.downcase ? k : nil} Rails.logger.info ("returned locale #{ret}") return ret end @@ -58,7 +59,7 @@ module LangHelper end def show_language - langs = I18n.supported_locales.sort + langs = supported_languages.sort ret = "<h4>" + _("Select locale") + "</h4>" langs.each_with_index do |lang, i| ret << link_to( language_name(lang), @@ -74,5 +75,16 @@ module LangHelper # flash[:notice] = _('Cookie "lang" is set: %s') % params["id"] redirect_to :back end + + #do not use this constant (only internal), use supported_languages method + SUPPORTED_LANGUAGE= [ + "ar","cs","de","es","en_US","fr","hu","it","ja","ko", + "nl","pl","pt_BR","ru","sv","zh_CN","zh_TW" + ] + def supported_languages + #TODO read from file if vendor want create own translations + #list is same as SLE11SP1 supported + return SUPPORTED_LANGUAGE + end end -- 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] r59822 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: rhafer Date: Fri Nov 27 12:05:11 2009 New Revision: 59822 URL: http://svn.opensuse.org/viewcvs/yast?rev=59822&view=rev Log: preparing 2.17.24 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION Fri Nov 27 12:05:11 2009 @@ -1 +1 @@ -2.17.23 +2.17.24 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Fri Nov 27 12:05:11 2009 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- -Fri Nov 27 10:35:03 UTC 2009 - rhafer(a)novell.com +Fri Nov 27 11:03:47 UTC 2009 - rhafer(a)novell.com +- Version 2.17.24 - Refuse to setup master server in Proposal in the local hostname does not resolve (bnc#557773) - Proposal summary show information about server type and -- 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] r59821 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: rhafer Date: Fri Nov 27 11:36:45 2009 New Revision: 59821 URL: http://svn.opensuse.org/viewcvs/yast?rev=59821&view=rev Log: updated changelog Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Fri Nov 27 11:36:45 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Nov 27 10:35:03 UTC 2009 - rhafer(a)novell.com + +- Refuse to setup master server in Proposal in the local hostname + does not resolve (bnc#557773) +- Proposal summary show information about server type and + repliation setting now (bnc#557763) + +------------------------------------------------------------------- Tue Nov 24 16:51:31 UTC 2009 - rhafer(a)novell.com - fixed installation proposal for syncrepl slave setups -- 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] r59820 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp
by rhafer＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: rhafer Date: Fri Nov 27 11:36:40 2009 New Revision: 59820 URL: http://svn.opensuse.org/viewcvs/yast?rev=59820&view=rev Log: Mention replication setting in summary (bnc#557763) Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp Fri Nov 27 11:36:40 2009 @@ -101,6 +101,28 @@ warning = _("Unable to retrieve the system root password. Set an LDAP server password to continue."); warning_level = `blocker; } + if ( LdapServer::ReadSetupMaster() ) + { + proposal = _("Setting up LDAP Master Server:"); + } + else + { + proposal = _("Setting up standalone LDAP Server:"); + } + proposal = proposal + + HTML::List( [ _("Base DN: ") + defaults["suffix"]:"", + _("Root DN: ") + defaults["rootdn"]:"", + _("LDAP Password: ") + rootPWString + ] ); + } + else + { + map <string,any> syncrepl = LdapServer::ReadSyncreplBaseConfig(); + proposal = _("Setting up LDAP Slave Server") + + HTML::List( [ _("Provider: ") + (string)syncrepl["provider","protocol"]:"" + "://" + + (string)syncrepl["provider","target"]:"" + ":" + + tostring(syncrepl["provider","port"]:0) ] ); + } // Try to get Firewall status string fw_text = ""; @@ -131,16 +153,10 @@ fw_text = _("Firewall is disabled"); textdomain "ldap-server"; } - - proposal = _("LDAP Server Configuration:") + - HTML::List( [ _("Base DN: ") + defaults["suffix"]:"", - _("Root DN: ") + defaults["rootdn"]:"", - _("LDAP Password: ") + rootPWString - ] ) + - _("Start LDAP Server: ") + HTML::Bold( _("YES") ) + HTML::Newline() + - _("Register at SLP Daemon: ") + HTML::Bold( defaults["slpRegister"]:false ? _("YES") : _("NO") ) + - HTML::Newline() + - fw_text; + proposal = proposal + + _("Register at SLP Daemon: ") + HTML::Bold( defaults["slpRegister"]:false ? _("YES") : _("NO") ) + + HTML::Newline() + + fw_text; } else { proposal = _("Start LDAP Server: ") + HTML::Bold( _("NO") ); } -- 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] r59819 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/src/wizards.ycp
by rhafer＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: rhafer Date: Fri Nov 27 11:36:36 2009 New Revision: 59819 URL: http://svn.opensuse.org/viewcvs/yast?rev=59819&view=rev Log: cleanup ( e.g. tabs -> spaces) Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/wizards.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/wizards.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/wizards.ycp Fri Nov 27 11:36:36 2009 @@ -123,15 +123,15 @@ Label::BackButton(), Label::NextButton()); map aliases = $[ - "startup" : ``( EnableServiceDialog() ), - "servertype" : ``( ServerTypeDialog() ), - "tlssettings" : ``( TlsConfigDialog() ), - "database" : ``( ProposalDialog() ), - "summary" : ``(SummaryDialog() ), - "advanced" : ``(MainSequence() ), - "write" : ``( WriteDialog() ), - "slavesetup" : ``( SlaveSetupDialog() ), - "mastersetup" : ``( MasterSetupDialog() ), + "startup" : ``( EnableServiceDialog() ), + "servertype" : ``( ServerTypeDialog() ), + "tlssettings" : ``( TlsConfigDialog() ), + "database" : ``( ProposalDialog() ), + "summary" : ``(SummaryDialog() ), + "advanced" : ``(MainSequence() ), + "write" : ``( WriteDialog() ), + "slavesetup" : ``( SlaveSetupDialog() ), + "mastersetup" : ``( MasterSetupDialog() ), "replicationsummary": ``( ReplicatonSetupSummaryDialog() ) ]; @@ -162,21 +162,21 @@ ], "mastersetup" : $[ `next : "summary", - `abort : `abort, + `abort : `abort ], "summary" : $[ `next : "write", `abort : `abort, `advanced : "advanced" ], - "advanced" : $[ - `abort : `abort, - `next : "write" - ], - "write" : $[ - `abort : `abort, - `next : `next - ] + "advanced" : $[ + `abort : `abort, + `next : "write" + ], + "write" : $[ + `abort : `abort, + `next : `next + ] ]; y2milestone( "--> starting ProposalSequence" ); -- 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] r59818 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server/src: LdapServer.pm dialogs.ycp
by rhafer＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: rhafer Date: Fri Nov 27 11:36:33 2009 New Revision: 59818 URL: http://svn.opensuse.org/viewcvs/yast?rev=59818&view=rev Log: Refuse master setup if fqdn cannot be resolved (bnc#557773) in cn=config replication the master must contain a syncrepl statement pointing to itself. slapd on the master will ignore that syncrepl statement, for that to work the hostname needs to be resolvable. Otherwise the master will think it's a slave and refuses to accept modifications. Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Fri Nov 27 11:36:33 2009 @@ -35,6 +35,7 @@ my %error = ( msg => undef, details => undef ); my $ssl_check_command = "/usr/lib/YaST2/bin/ldap-server-ssl-check"; my $usingDefaults = 1; +my $fqdn = ""; my $readConfig = 0; my $restartRequired = 0; my $configured = 0; @@ -324,6 +325,28 @@ } ## + # @return the full qualified hostname of the machine or "" if not set + # +BEGIN { $TYPEINFO{ReadHostnameFQ} = ["function", "string"]; } +sub ReadHostnameFQ() +{ + if ( $fqdn eq "" ) + { + my $rc = SCR->Execute( '.target.bash_output', "/bin/hostname -f" ); + if ( $rc->{'stdout'} eq "" ) + { + y2milestone("could determine fqdn, hostname -f returned: ". $rc->{'stderr'} ); + } + else + { + $fqdn = $rc->{'stdout'}; + chomp($fqdn); + } + } + return $fqdn; +} + +## # @return Set base DN that shoudl we written to /etc/openldap/ldap.conf # BEGIN { $TYPEINFO{WriteLdapConfBase} = ["function", "boolean", "string"]; } @@ -1598,6 +1621,7 @@ my $domain = $rc->{"stdout"}; if ( $domain eq "" ) { + y2milestone("\"hostname -d\" returned: \"". $rc->{'stderr'} . "\" falling back to default"); $domain = "site"; } chomp($domain); @@ -1748,13 +1772,17 @@ my $syncpw = GenerateRandPassword(); my $syncdn = "uid=syncrepl,ou=system,".$dbDefaults{'suffix'}; - my $rc = SCR->Execute( '.target.bash_output', "/bin/hostname -f" ); - my $fqdn = $rc->{"stdout"}; - chomp($fqdn); + my $hostname = $self->ReadHostnameFQ(); + if ( $hostname eq "" ) + { + $self->SetError( _("Could not determine own full qualified hostname"), + _("A master server for replication cannot work correctly without knowing the own full qualified hostname") ); + return 0; + } my $syncrepl = { "provider" => { "protocol" => "ldap", - "target" => $fqdn, + "target" => $hostname, "port" => YaST::YCP::Integer(389) }, "type" => "refreshAndPersist", Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp Fri Nov 27 11:36:33 2009 @@ -335,8 +335,19 @@ } else if (UI::QueryWidget( `id( `rbg_servertype ), `CurrentButton) == `rb_master ) { - LdapServer::WriteSetupMaster(true); - LdapServer::WriteSetupSlave(false); + if ( size( LdapServer::ReadHostnameFQ() ) == 0 ) + { + Popup::Notify(_("YaST was not able to determine the full qualified hostname of this\ncomputer. ") + + _("Setting up a replication master it not possible currently.") ); + UI::ChangeWidget( `rb_master, `Enabled, false ); + UI::ChangeWidget( `rbg_servertype, `CurrentButton, `rb_standalone ); + continue; + } + else + { + LdapServer::WriteSetupMaster(true); + LdapServer::WriteSetupSlave(false); + } } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59817 - in /trunk/qt-pkg/src: YQPkgPackageKitGroupsFilterView.cc YQPkgVersionsView.cc YQPkgVersionsView.h
by tgoettlicher＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: tgoettlicher Date: Fri Nov 27 11:29:51 2009 New Revision: 59817 URL: http://svn.opensuse.org/viewcvs/yast?rev=59817&view=rev Log: worked on multiversion install Modified: trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc trunk/qt-pkg/src/YQPkgVersionsView.cc trunk/qt-pkg/src/YQPkgVersionsView.h Modified: trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPackageKitGroups… ============================================================================== --- trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc Fri Nov 27 11:29:51 2009 @@ -334,24 +334,24 @@ return true; } - if ( selectedGroup() == YPKG_GROUP_RECOMMENDED && - zypp::PoolItem(pkg).status().isRecommended() ) - { - emit filterMatch( selectable, pkg ); - return true; - } - if ( selectedGroup() == YPKG_GROUP_SUGGESTED && - zypp::PoolItem(pkg).status().isSuggested() ) - { - emit filterMatch( selectable, pkg ); - return true; - } - if ( selectedGroup() == YPKG_GROUP_ORPHANED && - zypp::PoolItem(pkg).status().isOrphaned() ) - { - emit filterMatch( selectable, pkg ); - return true; - } + if ( selectedGroup() == YPKG_GROUP_RECOMMENDED && + zypp::PoolItem(pkg).status().isRecommended() ) + { + emit filterMatch( selectable, pkg ); + return true; + } + if ( selectedGroup() == YPKG_GROUP_SUGGESTED && + zypp::PoolItem(pkg).status().isSuggested() ) + { + emit filterMatch( selectable, pkg ); + return true; + } + if ( selectedGroup() == YPKG_GROUP_ORPHANED && + zypp::PoolItem(pkg).status().isOrphaned() ) + { + emit filterMatch( selectable, pkg ); + return true; + } return false; } Modified: trunk/qt-pkg/src/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.cc (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.cc Fri Nov 27 11:29:51 2009 @@ -26,8 +26,9 @@ #include <QTabWidget> #include <QRegExp> #include <QHeaderView> -#include <QRadioButton> -#include <QCheckBox> +#include <QStylePainter> +#include <QStyleOptionButton> + #include "YQPkgVersionsView.h" #include "YQPkgRepoList.h" @@ -35,6 +36,7 @@ #include "YQi18n.h" #include "utf8.h" +#define ICONOFFSET 3 // the status icons have an asymmetrical transparent border YQPkgVersionsView::YQPkgVersionsView( QWidget * parent, bool userCanSwitch ) @@ -146,77 +148,86 @@ qDeleteAll( _installed ); _installed.clear(); - - // - // Fill installed objects - // + if ( selectable->multiversionInstall() ) { - zypp::ui::Selectable::installed_iterator it = selectable->installedBegin(); + // + // Find installed and available objects ( for multiversion view ) + // + { + zypp::ui::Selectable::installed_iterator it = selectable->availableBegin(); + - while ( it != selectable->installedEnd() ) + while ( it != selectable->availableEnd() ) + { + YQPkgMultiVersion * version = new YQPkgMultiVersion( this, selectable, *it, _userCanSwitch ); + + _installed.push_back( version ); + _layout->addWidget( version ); + + ++it; + } + } + } + else + { + // + // Fill installed objects + // { - QString text = _( "%1-%2 from vendor %3 (installed)" ) - .arg( (*it)->edition().asString().c_str() ) - .arg( (*it)->arch().asString().c_str() ) - .arg( (*it)->vendor().c_str() ) ; - - QWidget * installedVersion = new QWidget( this ); - QHBoxLayout * instLayout = new QHBoxLayout( installedVersion ); - instLayout->setContentsMargins( 0, 0, 0, 0 ); - - QLabel * icon = new QLabel( installedVersion ); - icon->setPixmap( YQIconPool::pkgSatisfied() ); - instLayout->addWidget( icon ); + zypp::ui::Selectable::installed_iterator it = selectable->installedBegin(); + + while ( it != selectable->installedEnd() ) + { + QString text = _( "%1-%2 from vendor %3 (installed)" ) + .arg( (*it)->edition().asString().c_str() ) + .arg( (*it)->arch().asString().c_str() ) + .arg( (*it)->vendor().c_str() ) ; + + QWidget * installedVersion = new QWidget( this ); + QHBoxLayout * instLayout = new QHBoxLayout( installedVersion ); + instLayout->setContentsMargins( 0, 0, 0, 0 ); + + QLabel * icon = new QLabel( installedVersion ); + icon->setPixmap( YQIconPool::pkgSatisfied() ); + instLayout->addWidget( icon ); - QLabel * textLabel = new QLabel( text, installedVersion ); - instLayout->addWidget( textLabel ); - instLayout->addStretch(); + QLabel * textLabel = new QLabel( text, installedVersion ); + instLayout->addWidget( textLabel ); + instLayout->addStretch(); - _installed.push_back( installedVersion ); - _layout->addWidget( installedVersion ); + _installed.push_back( installedVersion ); + _layout->addWidget( installedVersion ); - ++it; + ++it; + } } - } - // - // Fill available objects - // + // + // Fill available objects + // - { - zypp::ui::Selectable::available_iterator it = selectable->availableBegin(); - - while ( it != selectable->availableEnd() ) { - QAbstractButton *button; - if ( false ) // check for multiversion - { - QCheckBox *c = new YQPkgMultiVersion( this, selectable, *it, _userCanSwitch ); - button = dynamic_cast<QAbstractButton *> (c); - _buttons->setExclusive(false); - } - else - { - QRadioButton *r = new YQPkgSingleVersion( this, selectable, *it, _userCanSwitch ); - button = dynamic_cast<QAbstractButton *> (r); - _buttons->setExclusive(true); - } + zypp::ui::Selectable::available_iterator it = selectable->availableBegin(); - connect( button, SIGNAL( clicked( bool ) ), SLOT( checkForChangedCandidate() ) ); + while ( it != selectable->availableEnd() ) + { + QRadioButton *radioButton = new YQPkgVersion( this, selectable, *it, _userCanSwitch ); + connect( radioButton, SIGNAL( clicked( bool ) ), SLOT( checkForChangedCandidate() ) ); - _buttons->addButton( button ); - _layout->addWidget( button ); + _buttons->addButton( radioButton ); + _layout->addWidget( radioButton ); - if ( selectable->hasCandidateObj() && - selectable->candidateObj()->edition() == (*it)->edition() && - selectable->candidateObj()->arch() == (*it)->arch() ) - { - button->setChecked(true); - } + if ( selectable->hasCandidateObj() && + selectable->candidateObj()->edition() == (*it)->edition() && + selectable->candidateObj()->arch() == (*it)->arch() ) + { + radioButton->setChecked(true); + } - ++it; + ++it; + } } } @@ -301,17 +312,35 @@ + + + YQPkgVersion::YQPkgVersion( QWidget * parent, ZyppSel selectable, ZyppObj zyppObj, bool enabled ) - : QAbstractButton( parent ) + : QRadioButton( parent ) , _selectable( selectable ) , _zyppObj( zyppObj ) { - // NOP + // Translators: %1 is a package version, %2 the package architecture, + // %3 describes the repository where it comes from, + // %4 is the repository's priority + // %5 is the vendor of the package + // Examples: + // 2.5.23-i568 from Packman with priority 100 and vendor openSUSE + // 3.17.4-i386 from openSUSE-11.1 update repository with priority 20 and vendor openSUSE + // ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^ + // %1 %2 %3 %4 %5 + setText( _( "%1-%2 from %3 with priority %4 and vendor %5" ) + .arg( zyppObj->edition().asString().c_str() ) + .arg( zyppObj->arch().asString().c_str() ) + .arg( zyppObj->repository().info().name().c_str() ) + .arg( zyppObj->repository().info().priority() ) + .arg( zyppObj->vendor().c_str() ) ); } + YQPkgVersion::~YQPkgVersion() { // NOP @@ -329,65 +358,179 @@ return tip; } + + YQPkgMultiVersion::YQPkgMultiVersion( QWidget * parent, ZyppSel selectable, ZyppObj zyppObj, bool enabled ) - : YQPkgVersion( parent, selectable, zyppObj, enabled) - , QCheckBox( parent ) + : QCheckBox( parent ) + , _selectable( selectable ) + , _zyppObj( zyppObj ) { - // Translators: %1 is a package version, %2 the package architecture, - // %3 describes the repository where it comes from, - // %4 is the repository's priority - // %5 is the vendor of the package - // Examples: - // 2.5.23-i568 from Packman with priority 100 and vendor openSUSE - // 3.17.4-i386 from openSUSE-11.1 update repository with priority 20 and vendor openSUSE - // ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^ - // %1 %2 %3 %4 %5 - QCheckBox::setText( _( "%1-%2 from %3 with priority %4 and vendor %5" ) + setText (_( "%1-%2 from %3 with priority %4 and vendor %5" ) .arg( zyppObj->edition().asString().c_str() ) .arg( zyppObj->arch().asString().c_str() ) .arg( zyppObj->repository().info().name().c_str() ) .arg( zyppObj->repository().info().priority() ) - .arg( zyppObj->vendor().c_str() ) ); + .arg( zyppObj->vendor().c_str() )); + + + connect( this, SIGNAL (toggled(bool)), this, SLOT( slotIconClicked())); + + + } + YQPkgMultiVersion::~YQPkgMultiVersion() { // NOP } -YQPkgSingleVersion::YQPkgSingleVersion( QWidget * parent, - ZyppSel selectable, - ZyppObj zyppObj, - bool enabled ) - : YQPkgVersion( parent, selectable, zyppObj, enabled) - , QRadioButton( parent ) +void YQPkgMultiVersion::slotIconClicked() { - // Translators: %1 is a package version, %2 the package architecture, - // %3 describes the repository where it comes from, - // %4 is the repository's priority - // %5 is the vendor of the package - // Examples: - // 2.5.23-i568 from Packman with priority 100 and vendor openSUSE - // 3.17.4-i386 from openSUSE-11.1 update repository with priority 20 and vendor openSUSE - // ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^ - // %1 %2 %3 %4 %5 - QRadioButton::setText( _( "%1-%2 from %3 with priority %4 and vendor %5" ) - .arg( zyppObj->edition().asString().c_str() ) - .arg( zyppObj->arch().asString().c_str() ) - .arg( zyppObj->repository().info().name().c_str() ) - .arg( zyppObj->repository().info().priority() ) - .arg( zyppObj->vendor().c_str() ) ); + // prevent checkmark, we draw the status icons ourselves + setChecked( false ); + + + cycleStatus(); } -YQPkgSingleVersion::~YQPkgSingleVersion() +void YQPkgMultiVersion::cycleStatus() { - // NOP + + ZyppStatus oldStatus = _selectable->status(); + ZyppStatus newStatus = oldStatus; + + switch ( oldStatus ) + { + case S_Install: + newStatus = S_NoInst; + break; + + case S_Protected: + newStatus = _selectable->hasCandidateObj() ? + S_KeepInstalled: S_NoInst; + break; + + case S_Taboo: + newStatus = _selectable->hasInstalledObj() ? + S_KeepInstalled : S_NoInst; + break; + + case S_KeepInstalled: + newStatus = _selectable->hasCandidateObj() ? + S_Update : S_Del; + break; + + case S_Update: + newStatus = S_Del; + break; + + case S_AutoUpdate: + newStatus = S_KeepInstalled; + break; + + case S_Del: + case S_AutoDel: + newStatus = S_KeepInstalled; + break; + + case S_NoInst: + if ( _selectable->hasCandidateObj() ) + { + newStatus = S_Install; + } + else + { + yuiWarning() << "No candidate for " << _selectable->theObj()->name() << endl; + newStatus = S_NoInst; + } + break; + + case S_AutoInstall: + // this used to be taboo before, but now ZYpp supports + // saving weak locks (unselected packages) + newStatus = S_NoInst; + break; + } + + yuiMilestone() << "new status: " << newStatus << endl; + setStatus( newStatus ); + +// _pkgObjList->sendStatusChanged(); + +} + +void YQPkgMultiVersion::setStatus( ZyppStatus newStatus ) +{ + ZyppStatus oldStatus = _selectable->status(); + _selectable->setStatus( newStatus ); + + if ( oldStatus != _selectable->status() ) + { +// applyChanges(); + +/* if ( sendSignals ) + { + _pkgObjList->updateItemStates(); + _pkgObjList->sendUpdatePackages(); + }*/ + } + + // setStatusIcon(); +} + + + + + +void YQPkgMultiVersion::paintEvent(QPaintEvent *) +{ + // draw the usual checkbox + QStylePainter p(this); + QStyleOptionButton opt; + initStyleOption(&opt); + p.drawControl(QStyle::CE_CheckBox, opt); + + + + // calculate position and draw the status icon + QRect elementRect = style()->subElementRect ( QStyle::SE_CheckBoxIndicator, &opt); + QPixmap icon = statusIcon( _selectable->status() ); + + QPoint start = elementRect.center() - icon.rect().center(); + QRect rect = QRect(start.x() - ICONOFFSET, start.y(), icon.width(), icon.height()); + + p.drawItemPixmap(rect, 0, icon ); } +QPixmap YQPkgMultiVersion::statusIcon( ZyppStatus status ) +{ + QPixmap icon = YQIconPool::pkgNoInst(); + + switch ( status ) + { + case S_Del: icon = YQIconPool::pkgDel(); break; + case S_Install: icon = YQIconPool::pkgInstall(); break; + case S_KeepInstalled: icon = YQIconPool::pkgKeepInstalled(); break; + case S_NoInst: icon = QPixmap(); break; + case S_Protected: icon = YQIconPool::pkgProtected(); break; + case S_Taboo: icon = YQIconPool::pkgTaboo(); break; + case S_Update: icon = YQIconPool::pkgUpdate(); break; + + case S_AutoDel: icon = YQIconPool::pkgAutoDel(); break; + case S_AutoInstall: icon = YQIconPool::pkgAutoInstall(); break; + case S_AutoUpdate: icon = YQIconPool::pkgAutoUpdate(); break; + + // Intentionally omitting 'default' branch so the compiler can + // catch unhandled enum states + } + return icon; +} + #include "YQPkgVersionsView.moc" Modified: trunk/qt-pkg/src/YQPkgVersionsView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.h?r… ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.h (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.h Fri Nov 27 11:29:51 2009 @@ -30,6 +30,7 @@ #include "YQZypp.h" + class QTabWidget; @@ -118,7 +119,7 @@ }; -class YQPkgVersion : public QAbstractButton +class YQPkgVersion : public QRadioButton { public: @@ -164,8 +165,11 @@ }; -class YQPkgMultiVersion : public YQPkgVersion, public QCheckBox + +class YQPkgMultiVersion: public QCheckBox { + Q_OBJECT + public: /** @@ -182,29 +186,43 @@ **/ virtual ~YQPkgMultiVersion(); - void paintEvent(QPaintEvent* pe){ QCheckBox::paintEvent(pe); }; - -}; - -class YQPkgSingleVersion : public YQPkgVersion, public QRadioButton -{ -public: - /** - * Constructor. Creates a YQPkgVersion item that corresponds to the package - * manager object that 'pkg' refers to. + * Returns the original ZYPP object **/ - YQPkgSingleVersion( QWidget * parent, - ZyppSel selectable, - ZyppObj zyppObj, - bool enabled = true ); + ZyppObj zyppObj() const { return _zyppObj; } /** - * Destructor + * Returns the original ZYPP selectable **/ - virtual ~YQPkgSingleVersion(); + ZyppSel selectable() const { return _selectable; } + + + void paintEvent(QPaintEvent *); + + + + +protected: + + void cycleStatus(); + void setStatus( ZyppStatus newStatus ); + QPixmap statusIcon( ZyppStatus status ); + + + + + + // Data members + + ZyppSel _selectable; + ZyppObj _zyppObj; + + + int _state; + +protected slots: + void slotIconClicked(); - void paintEvent(QPaintEvent* pe){ QRadioButton::paintEvent(pe); }; }; -- 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] r59816 - /tags/stable-2_19_0/firewall/
by kmachalkova＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: kmachalkova Date: Fri Nov 27 10:52:29 2009 New Revision: 59816 URL: http://svn.opensuse.org/viewcvs/yast?rev=59816&view=rev Log: Created tag stable-2_19_0 for firewall Added: tags/stable-2_19_0/firewall/ - copied from r59815, trunk/firewall/ -- 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] r59815 - in /trunk/gtk: ChangeLog src/pkg/YGPackageSelector.cc
by rpmcruz＠svn.opensuse.org 26 Nov '09

26 Nov '09

Author: rpmcruz Date: Thu Nov 26 21:48:50 2009 New Revision: 59815 URL: http://svn.opensuse.org/viewcvs/yast?rev=59815&view=rev Log: * src/YGPackageSelector.cc: added support for search based on description, filelist and author. Modified: trunk/gtk/ChangeLog trunk/gtk/src/pkg/YGPackageSelector.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=59815&r1=59814… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Nov 26 21:48:50 2009 @@ -1,5 +1,10 @@ 2009-10-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + * src/YGPackageSelector.cc: added support for + search based on description, filelist and author. + +2009-10-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + * Reverted to development state. * src/YGPackageSelector.cc: some UI changes to 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 Nov 26 21:48:50 2009 @@ -1812,7 +1812,7 @@ class SearchEntry : public _QueryWidget { -GtkWidget *m_widget, *m_entry; +GtkWidget *m_widget, *m_entry, *m_combo; bool m_clearIcon; public: @@ -1822,8 +1822,9 @@ g_signal_connect (G_OBJECT (m_entry), "realize", G_CALLBACK (grab_focus_cb), NULL); gtk_widget_set_size_request (m_entry, 50, -1); - GtkWidget *entry_hbox = gtk_hbox_new (FALSE, 2); - gtk_box_pack_start (GTK_BOX (entry_hbox), gtk_label_new (_("Find:")), FALSE, TRUE, 0); + GtkWidget *entry_hbox = gtk_hbox_new (FALSE, 2), *find_label; + find_label = gtk_label_new (_("Find:")); + gtk_box_pack_start (GTK_BOX (entry_hbox), find_label, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (entry_hbox), m_entry, TRUE, TRUE, 0); m_clearIcon = false; @@ -1832,11 +1833,28 @@ g_signal_connect (G_OBJECT (m_entry), "icon-press", G_CALLBACK (icon_press_cb), this); + m_combo = gtk_combo_box_new_text(); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("Name & Summary")); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("Description")); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("File List")); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("Author")); + gtk_combo_box_set_active (GTK_COMBO_BOX (m_combo), 0); + g_signal_connect (G_OBJECT (m_combo), "changed", + G_CALLBACK (combo_changed_cb), this); + + GtkWidget *opt_hbox = gtk_hbox_new (FALSE, 2), *empty = gtk_event_box_new(); + gtk_box_pack_start (GTK_BOX (opt_hbox), empty, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (opt_hbox), gtk_label_new (_("by")), FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (opt_hbox), m_combo, TRUE, TRUE, 0); + + GtkSizeGroup *group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + gtk_size_group_add_widget (group, find_label); + gtk_size_group_add_widget (group, empty); + g_object_unref (G_OBJECT (group)); + m_widget = gtk_vbox_new (FALSE, 4); - GtkWidget *expander = gtk_expander_new (_("Options")); - gtk_container_add (GTK_CONTAINER (expander), gtk_label_new ("TO DO")); gtk_box_pack_start (GTK_BOX (m_widget), entry_hbox, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (m_widget), expander, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (m_widget), opt_hbox, FALSE, TRUE, 0); } virtual GtkWidget *getWidget() { return m_widget; } @@ -1849,7 +1867,10 @@ { const gchar *name = gtk_entry_get_text (GTK_ENTRY (m_entry)); if (*name) { - query->addNames (name, ' '); + int opt = gtk_combo_box_get_active (GTK_COMBO_BOX (m_combo)); + bool whole_word = opt >= 2; + query->addNames (name, ' ', opt == 0, opt == 0, opt == 1, opt == 2, + opt == 3, whole_word); return true; } return false; @@ -1873,6 +1894,12 @@ } } + static void combo_changed_cb (GtkComboBox *combo, SearchEntry *pThis) + { + pThis->notify(); + gtk_widget_grab_focus (pThis->m_entry); + } + static void icon_press_cb (GtkEntry *entry, GtkEntryIconPosition pos, GdkEvent *event, SearchEntry *pThis) { gtk_entry_set_text (entry, ""); } @@ -2232,7 +2259,7 @@ gtk_box_pack_start (GTK_BOX (view_vbox), view_pane, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (view_vbox), type_hbox, FALSE, TRUE, 0); - GtkWidget *side_vbox = gtk_vbox_new (FALSE, 6); + GtkWidget *side_vbox = gtk_vbox_new (FALSE, 12); m_query[0] = new SearchEntry(); gtk_box_pack_start (GTK_BOX (side_vbox), m_query[0]->getWidget(), FALSE, TRUE, 0); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0