October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41422 - /tags/stable-2_13_2/pos-installation/
by locilka＠svn.opensuse.org 15 Oct '07

15 Oct '07

Author: locilka Date: Mon Oct 15 13:18:19 2007 New Revision: 41422 URL: http://svn.opensuse.org/viewcvs/yast?rev=41422&view=rev Log: One more fix Removed: tags/stable-2_13_2/pos-installation/ -- 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] r41421 - /tags/stable-2_13_2/pos-installation/
by locilka＠svn.opensuse.org 15 Oct '07

15 Oct '07

Author: locilka Date: Mon Oct 15 13:08:28 2007 New Revision: 41421 URL: http://svn.opensuse.org/viewcvs/yast?rev=41421&view=rev Log: Created tag stable-2_13_2 for pos-installation Added: tags/stable-2_13_2/pos-installation/ - copied from r41420, trunk/pos-installation/ -- 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] r41420 - in /trunk/pos-installation: ./ control/ package/ src/clients/
by locilka＠svn.opensuse.org 15 Oct '07

15 Oct '07

Author: locilka Date: Mon Oct 15 13:07:57 2007 New Revision: 41420 URL: http://svn.opensuse.org/viewcvs/yast?rev=41420&view=rev Log: - Changing location of migration control file to /etc/SLEPOS. - Adding real-data migration configuration. - Proposing to skip migration if nothing to migrate is available. - 2.13.2 Modified: trunk/pos-installation/VERSION trunk/pos-installation/control/Makefile.am trunk/pos-installation/control/slepos_migration.xml trunk/pos-installation/package/yast2-pos-installation.changes trunk/pos-installation/src/clients/inst_slepos_data_migration.ycp trunk/pos-installation/yast2-pos-installation.spec.in Modified: trunk/pos-installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/VERSION?rev=414… ============================================================================== --- trunk/pos-installation/VERSION (original) +++ trunk/pos-installation/VERSION Mon Oct 15 13:07:57 2007 @@ -1 +1 @@ -2.13.1 +2.13.2 Modified: trunk/pos-installation/control/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/control/Makefil… ============================================================================== --- trunk/pos-installation/control/Makefile.am (original) +++ trunk/pos-installation/control/Makefile.am Mon Oct 15 13:07:57 2007 @@ -2,7 +2,7 @@ # SUBDIRS = -controldir = /etc/YaST2 +controldir = /etc/SLEPOS control_DATA = slepos_migration.xml Modified: trunk/pos-installation/control/slepos_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/control/slepos_… ============================================================================== --- trunk/pos-installation/control/slepos_migration.xml (original) +++ trunk/pos-installation/control/slepos_migration.xml Mon Oct 15 13:07:57 2007 @@ -3,13 +3,13 @@ xmlns:config="http://www.suse.com/1.0/configns"> <config>  - <default_backupdir>/var/adm/backup/SLEPOS_DATA/</default_backupdir> + <default_backupdir>/var/lib/SLEPOS/backup/</default_backupdir>  - <default_backupname>SLEPOS_DATA_</default_backupname> + <default_backupname>NLPOS9_DATA_</default_backupname>  - <default_do_backup config:type="boolean">false</default_do_backup> + <default_do_backup config:type="boolean">true</default_do_backup>  <migration_redraw_sleep config:type="integer">50</migration_redraw_sleep> @@ -22,58 +22,35 @@ </config> <itemcopies config:type="list"> - <itemcopy> +  <type>directory</type> - <source>/yast/test/XML</source> - <destination>/srv/SLEPOS/1/</destination> + <source>/tftpboot</source> + <destination>/srv/tftpboot</destination> </itemcopy> <itemcopy> <type>directory</type> - <source>/yast/Botanicka</source> - <destination>/srv/SLEPOS/15/</destination> +  + <source>/opt/SLES/POS/rsync</source> + <destination>/srv/SLEPOS</destination> </itemcopy> <itemcopy> <type>directory</type> - <source>/yast/CODE11/SL_11.0/zypp/</source> -  - <destination>/srv/SLEPOS/2/</destination> +  + <source>from /opt/SLES/POS/system to </source> + <destination>/var/lib/SLEPOS/system/nlpos9_images</destination> </itemcopy> - <itemcopy> - <type>file</type> - <source>/yast/CODE11/Alpha6Test.xml</source> -  - <destination>/srv/SLEPOS/3</destination> - </itemcopy> - - <itemcopy> +  + <destination>/srv/SLEPOS/4/</destination> - </itemcopy> + </itemcopy>--> - <itemcopy> - <type>directory</type> - <source>/tmp/some/missing/dir</source> - <destination>/srv/SLEPOS/5/</destination> - </itemcopy> - -  - <itemcopy> - <type>directory</type> - <destination>/srv/SLEPOS/12/</destination> - </itemcopy> - -  - <itemcopy> - <type>dyrectori</type> - <source>/tmp/</source> - <destination>/tmp/</destination> - </itemcopy> + </itemcopies> </migrate> Modified: trunk/pos-installation/package/yast2-pos-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/package/yast2-p… ============================================================================== --- trunk/pos-installation/package/yast2-pos-installation.changes (original) +++ trunk/pos-installation/package/yast2-pos-installation.changes Mon Oct 15 13:07:57 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Oct 15 12:38:05 CEST 2007 - locilka(a)suse.cz + +- Changing location of migration control file to /etc/SLEPOS. +- Adding real-data migration configuration. +- Proposing to skip migration if nothing to migrate is available. +- 2.13.2 + +------------------------------------------------------------------- Mon Oct 15 08:42:43 CEST 2007 - locilka(a)suse.cz - Renamed scripts *.ycp to inst_*.ycp (#333495) Modified: trunk/pos-installation/src/clients/inst_slepos_data_migration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/clients/ins… ============================================================================== --- trunk/pos-installation/src/clients/inst_slepos_data_migration.ycp (original) +++ trunk/pos-installation/src/clients/inst_slepos_data_migration.ycp Mon Oct 15 13:07:57 2007 @@ -1,6 +1,6 @@ { // Configuration - string migration_conf = "/etc/YaST2/slepos_migration.xml"; + string migration_conf = "/etc/SLEPOS/slepos_migration.xml"; // Default values are defined in $migration_conf file // Fallback values below @@ -261,7 +261,7 @@ `Left (`Label (_("Note: Migration can take very long time according to the current size of your data."))) ), // TRANSLATORS: Dialog help - _("Some help - FIXME!!!!"), + _("Some help - FIXME Text1!!!!"), Label::BackButton(), Label::NextButton() ); @@ -484,7 +484,7 @@ `VStretch () ), // TRANSLATORS: Dialog help - _("Some help - FIXME!!!!"), + _("Some help - FIXME Text2!!!!"), Label::BackButton(), Label::NextButton() ); @@ -492,8 +492,20 @@ Wizard::SetTitleIcon ("yast-disk"); } + void SetMigrationDialogInit () { + if (size (copy_data_dirs) > 0 || size (copy_data_files) > 0) { + y2milestone ("Something to be migrated"); + UI::ChangeWidget (`id (`skip_or_do_migration), `CurrentButton, `do_migrate); + } else { + y2warning ("Nothing to migrate"); + UI::ChangeWidget (`id (`skip_or_do_migration), `CurrentButton, `skip_migration); + } + AdjustMigrationDialog(); + } + symbol InitialDialog () { DisplayMigrationDialog(); + SetMigrationDialogInit(); symbol init_dialog_ret = HandleMigrationDialog(); y2milestone ("InitDialog: %1", init_dialog_ret); @@ -940,7 +952,7 @@ `Label (_("Running post-migration script...")) ), // TRANSLATORS: Dialog help - _("Some help - FIXME!!!!"), + _("Some help - FIXME Text3!!!!"), Label::BackButton(), Label::NextButton() ); Modified: trunk/pos-installation/yast2-pos-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/yast2-pos-insta… ============================================================================== --- trunk/pos-installation/yast2-pos-installation.spec.in (original) +++ trunk/pos-installation/yast2-pos-installation.spec.in Mon Oct 15 13:07:57 2007 @@ -23,5 +23,5 @@ %defattr(-,root,root) @clientdir@/*.ycp @desktopdir@/*.desktop -/etc/YaST2/* +/etc/SLEPOS/* %doc @docdir@ -- 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] r41419 - /tags/stable-2_13_1/pos-installation/
by locilka＠svn.opensuse.org 15 Oct '07

15 Oct '07

Author: locilka Date: Mon Oct 15 08:49:40 2007 New Revision: 41419 URL: http://svn.opensuse.org/viewcvs/yast?rev=41419&view=rev Log: Created tag stable-2_13_1 for pos-installation Added: tags/stable-2_13_1/pos-installation/ - copied from r41418, trunk/pos-installation/ -- 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] r41418 - in /trunk/pos-installation: ./ config/ package/ src/clients/
by locilka＠svn.opensuse.org 15 Oct '07

15 Oct '07

Author: locilka Date: Mon Oct 15 08:47:11 2007 New Revision: 41418 URL: http://svn.opensuse.org/viewcvs/yast?rev=41418&view=rev Log: - Renamed scripts *.ycp to inst_*.ycp (#333495) - 2.13.1 Added: trunk/pos-installation/src/clients/inst_slepos_data_migration.ycp - copied unchanged from r41357, trunk/pos-installation/src/clients/slepos_data_migration.ycp trunk/pos-installation/src/clients/inst_slepos_server_selection.ycp - copied unchanged from r41357, trunk/pos-installation/src/clients/slepos_server_selection.ycp Removed: trunk/pos-installation/src/clients/slepos_data_migration.ycp trunk/pos-installation/src/clients/slepos_server_selection.ycp Modified: trunk/pos-installation/VERSION trunk/pos-installation/config/pos_migration_assistent.desktop trunk/pos-installation/package/yast2-pos-installation.changes Modified: trunk/pos-installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/VERSION?rev=414… ============================================================================== --- trunk/pos-installation/VERSION (original) +++ trunk/pos-installation/VERSION Mon Oct 15 08:47:11 2007 @@ -1 +1 @@ -2.13.0 +2.13.1 Modified: trunk/pos-installation/config/pos_migration_assistent.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/config/pos_migr… ============================================================================== --- trunk/pos-installation/config/pos_migration_assistent.desktop (original) +++ trunk/pos-installation/config/pos_migration_assistent.desktop Mon Oct 15 08:47:11 2007 @@ -2,12 +2,12 @@ Type=Application Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; -X-SuSE-YaST-Call=slepos_data_migration +X-SuSE-YaST-Call=inst_slepos_data_migration X-SuSE-YaST-RootOnly=yes X-SuSE-YaST-Group=Misc Icon=yast-disk -Exec=/sbin/yast2 slepos_data_migration +Exec=/sbin/yast2 inst_slepos_data_migration Name=POS Migration Assistent GenericName=Migrate your old POS data to a new location Modified: trunk/pos-installation/package/yast2-pos-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/package/yast2-p… ============================================================================== --- trunk/pos-installation/package/yast2-pos-installation.changes (original) +++ trunk/pos-installation/package/yast2-pos-installation.changes Mon Oct 15 08:47:11 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 15 08:42:43 CEST 2007 - locilka(a)suse.cz + +- Renamed scripts *.ycp to inst_*.ycp (#333495) +- 2.13.1 + +------------------------------------------------------------------- Wed Oct 10 13:52:53 2007 - locilka(a)suse.cz - initial version -- 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] r41417 - in /branches/tmp/sh/mod-ui/ncurses/src: NCTable.cc NCTable.h NCTableItem.cc NCTableItem.h YNCursesUI.h
by kmachalkova＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: kmachalkova Date: Fri Oct 12 18:05:03 2007 New Revision: 41417 URL: http://svn.opensuse.org/viewcvs/yast?rev=41417&view=rev Log: Ported NCTable, part II (selecting items, updating cells, setting column alignment) Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc branches/tmp/sh/mod-ui/ncurses/src/NCTable.h branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.cc branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.h branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc Fri Oct 12 18:05:03 2007 @@ -45,10 +45,6 @@ InitPad(); // !!! head is UTF8 encoded, thus should be vector<YCPstring> header.assign( columns, NCstring("") ); - /*for ( unsigned i = 0; i < head.size(); ++i ) { - setHeader( i, head[i] ); - }*/ - hasHeadline = myPad()->SetHeadline( header ); } /////////////////////////////////////////////////////////////////// @@ -106,7 +102,6 @@ // void NCTable::setSize( int newwidth, int newheight ) { - NCMIL << "setSize() called: width: " << newwidth << " height: " << newheight << endl; wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); } @@ -138,9 +133,8 @@ if ( hasColumn( col )) { - header[ col ] = NCstring( text ) ; + header[ col ] += NCstring( text ) ; } - hasHeadline = myPad()->SetHeadline( header ); } @@ -153,10 +147,16 @@ void NCTable::setAlignment ( int col, YTable::Alignment al ) { - //FIXME: need something better than just dumb calling parent - // method - ncurses doesn't seem to support alignments natively + string s; + switch ( al ) + { + case YTable::Left: s = 'L' ; break; + case YTable::Center: s = 'C' ; break; + case YTable::Right: s = 'R' ; break; + } + + header[ col ] = NCstring( s ); YTable::setAlignment( col, al ); - } void NCTable::setKeepSorting ( bool keepSorting ) @@ -164,6 +164,7 @@ YTable::setKeepSorting( keepSorting ); sortable = keepSorting; } + /////////////////////////////////////////////////////////////////// // // @@ -178,6 +179,7 @@ return -1; return sortable ? myPad()->GetLine( myPad()->CurPos().L )->getIndex () : myPad()->CurPos().L; + } /////////////////////////////////////////////////////////////////// @@ -216,7 +218,10 @@ // void NCTable::addItem( YItem *yitem ) { + static int idx = 0; + YTableItem *item = dynamic_cast<YTableItem *>(yitem); + YUI_CHECK_PTR(item); YTable::addItem( item ); vector<NCTableCol*> Items( item->cellCount() ); @@ -228,11 +233,18 @@ Items[i] = new NCTableCol( NCstring( (*it)->label() ) ); i++; } - NCTableLine *newline = new NCTableLine( Items ); + + NCTableLine *newline = new NCTableLine( Items, idx++ ); + YUI_CHECK_PTR(newline); newline->setOrigItem( item ); myPad()->Append( newline ); - //myPad()->Append( Items, myPad()->Lines() ); + + if (item->selected() ) + { + setCurrentItem( myPad()->Lines() ) ; + } + DrawPad(); } @@ -251,6 +263,43 @@ YTable::deleteAllItems(); } +void NCTable::selectItem( YItem *yitem, bool selected ) +{ + YTableItem *item = dynamic_cast<YTableItem *>(yitem); + YUI_CHECK_PTR(item); + + NCTableLine *line = (NCTableLine *)item->data(); + YUI_CHECK_PTR(line); + + const NCTableLine *current_line = myPad()->GetLine( myPad()->CurPos().L ); + YUI_CHECK_PTR(current_line); + + if ( !selected && ( line == current_line ) ) + { + deselectAllItems(); + } + else + { + setCurrentItem( line->getIndex() ); + YTable::selectItem( item, selected); + } + + DrawPad(); +} + +void NCTable::deselectAllItems() +{ + setCurrentItem( -1 ); + YTable::deselectAllItems(); + DrawPad(); +} + +void NCTable::selectCurrentItem() +{ + const NCTableLine *cline = myPad()->GetLine( myPad()->CurPos().L ); + YTable::selectItem( cline->origItem() ); +} + /////////////////////////////////////////////////////////////////// // // @@ -352,8 +401,12 @@ } } + selectCurrentItem(); + if ( notify() && immediate && citem != getCurrentItem() ) + { ret = NCursesEvent::SelectionChanged; + } return ret; } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTable.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTable.h Fri Oct 12 18:05:03 2007 @@ -93,6 +93,9 @@ void SetHotCol( const int hcol ) { myPad()->SetHotCol( hcol ); } virtual void addItem( YItem *yitem ); + virtual void selectItem( YItem *yitem, bool selected ); + virtual void deselectAllItems(); + void selectCurrentItem(); virtual long nicesize( YUIDimension dim ); @@ -108,7 +111,7 @@ virtual void setLabel( const YCPString & nlabel ); - virtual int getCurrentItem(); + virtual int getCurrentItem(); virtual void setCurrentItem( int index ); bool setItemByKey( int key ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.cc Fri Oct 12 18:05:03 2007 @@ -139,8 +139,8 @@ void NCTableLine::setOrigItem (YTableItem *it) { - origItem = it; - origItem->setData(this); + yitem = it; + yitem->setData (this) ; } /////////////////////////////////////////////////////////////////// // Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.h Fri Oct 12 18:05:03 2007 @@ -63,7 +63,7 @@ int index; - YTableItem *origItem; + YTableItem *yitem; protected: @@ -77,6 +77,7 @@ NCTableLine( unsigned cols, int index = -1, const unsigned s = S_NORMAL ); NCTableLine( vector<NCTableCol*> & nItems, int index = -1, const unsigned s = S_NORMAL ); void setOrigItem( YTableItem *it); + YTableItem *origItem() const { return yitem; } virtual ~NCTableLine(); unsigned Cols() const { return Items.size(); } Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/YNC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h Fri Oct 12 18:05:03 2007 @@ -154,11 +154,6 @@ virtual YWidget * createMenuButton( YWidget * parent, YWidgetOpt & opt, const YCPString & label ); - /** - * Creates a table widget - virtual YWidget * createTable( YWidget * parent, YWidgetOpt & opt, - vector<string> header ); -*/ /** * Creates an IntField widget. -- 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] r41416 - /trunk/ca-management/package/yast2-ca-management.changes
by mcalmer＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: mcalmer Date: Fri Oct 12 17:59:31 2007 New Revision: 41416 URL: http://svn.opensuse.org/viewcvs/yast?rev=41416&view=rev Log: update changes Modified: trunk/ca-management/package/yast2-ca-management.changes Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-m… ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Fri Oct 12 17:59:31 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 12 17:58:47 CEST 2007 - mc(a)suse.de + +- add email for subject_alt_name in special cases +- enhance filter list for browser window + +------------------------------------------------------------------- Wed Oct 10 11:39:26 CEST 2007 - mc(a)suse.de - version 2.16.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] r41415 - in /trunk/ca-management/src: CaMgm.ycp new_cert_callbacks.ycp signRequest.ycp
by mcalmer＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: mcalmer Date: Fri Oct 12 17:58:31 2007 New Revision: 41415 URL: http://svn.opensuse.org/viewcvs/yast?rev=41415&view=rev Log: add email for subject_alt_name in special cases Modified: trunk/ca-management/src/CaMgm.ycp trunk/ca-management/src/new_cert_callbacks.ycp trunk/ca-management/src/signRequest.ycp Modified: trunk/ca-management/src/CaMgm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/CaMgm.ycp?rev=… ============================================================================== --- trunk/ca-management/src/CaMgm.ycp (original) +++ trunk/ca-management/src/CaMgm.ycp Fri Oct 12 17:58:31 2007 @@ -135,6 +135,9 @@ global string prop_state = ""; global symbol prop_selection = `def; // `none, `disk + +global boolean adv_subject_alt_name_show_email = false; + /** * variables for new CA/Certificate/Request */ Modified: trunk/ca-management/src/new_cert_callbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/new_cert_callb… ============================================================================== --- trunk/ca-management/src/new_cert_callbacks.ycp (original) +++ trunk/ca-management/src/new_cert_callbacks.ycp Fri Oct 12 17:58:31 2007 @@ -701,6 +701,7 @@ `RadioButtonGroup(`id(`rb), `HBox( `RadioButton(`id("URI"), `opt(`notify), "URI", true), + `RadioButton(`id("email"), `opt(`notify), "email"), `RadioButton(`id("DNS"), `opt(`notify), "DNS"), `RadioButton(`id("IP"), `opt(`notify), "IP"), `RadioButton(`id("RID"), `opt(`notify), "RID"), @@ -726,6 +727,14 @@ subject_box ); UI::SetFocus (`id(`ok)); + if(!CaMgm::adv_subject_alt_name_show_email) + { + UI::ChangeWidget(`id("email"), `Enabled, false); + } + else + { + UI::ChangeWidget(`id("email"), `Enabled, true); + } while (true) { any ret = UI::UserInput(); Modified: trunk/ca-management/src/signRequest.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/signRequest.yc… ============================================================================== --- trunk/ca-management/src/signRequest.ycp (original) +++ trunk/ca-management/src/signRequest.ycp Fri Oct 12 17:58:31 2007 @@ -670,8 +670,8 @@ string text = _("Summary"); text = text + " <pre>"; - text = text + "Subject: " + CaMgm::requestSubject; - text = text + "Valid Period: " + CaMgm::validPeriod + _(" days\n"); + text = text + "Subject: " + CaMgm::requestSubject + "\n"; + text = text + "Valid Period: " + CaMgm::validPeriod + _(" days") + "\n"; text = text + "Basic Constaints: " + CaMgm::adv_ca + (CaMgm::adv_cri_ca ? _(" (critical)") : "") ; if (CaMgm::adv_pathlen) @@ -1063,9 +1063,14 @@ } else { + CaMgm::adv_subject_alt_name_show_email = false; Popup::Message(_("The request has been signed.")); } } + else if( ui == `edit) + { + CaMgm::adv_subject_alt_name_show_email = true; + } } until (contains ([`back, `next, `abort, `edit], ui)); -- 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] r41414 - /trunk/ca-management/src/util.ycp
by mcalmer＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: mcalmer Date: Fri Oct 12 17:57:49 2007 New Revision: 41414 URL: http://svn.opensuse.org/viewcvs/yast?rev=41414&view=rev Log: enhance filter list for browser window Modified: trunk/ca-management/src/util.ycp Modified: trunk/ca-management/src/util.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/util.ycp?rev=4… ============================================================================== --- trunk/ca-management/src/util.ycp (original) +++ trunk/ca-management/src/util.ycp Fri Oct 12 17:57:49 2007 @@ -1221,7 +1221,7 @@ if (ret == `browse) { - string name = selectFile ( false, "*.pem *.der", "Import from ..." ); + string name = selectFile ( false, "*.pem *.req *.csr *.der", "Import from ..." ); if ( name != nil ) { UI::ChangeWidget(`id(`filename), `Value, name); @@ -1241,7 +1241,9 @@ else { string extention = ""; - if (substring (filename, findlastof (filename, ".")) == ".pem" ) + if (substring (filename, findlastof (filename, ".")) == ".pem" || + substring (filename, findlastof (filename, ".")) == ".req" || + substring (filename, findlastof (filename, ".")) == ".csr" ) { extention = "PEM"; } @@ -1338,7 +1340,7 @@ if (ret == `browseCert) { - string name = selectFile (false, "*.pem", "Import from ..." ); + string name = selectFile (false, "*.pem *.crt", "Import from ..." ); if ( name != nil ) { UI::ChangeWidget(`id(`pathCert), `Value, name); @@ -1348,7 +1350,7 @@ if (ret == `browseKey) { - string name = selectFile (false, "*.pem", "Import from ..." ); + string name = selectFile (false, "*.pem *.key", "Import from ..." ); if ( name != nil ) { UI::ChangeWidget(`id(`pathKey), `Value, name); -- 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] r41413 - /trunk/ca-management/src/popup.ycp
by mcalmer＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: mcalmer Date: Fri Oct 12 17:56:48 2007 New Revision: 41413 URL: http://svn.opensuse.org/viewcvs/yast?rev=41413&view=rev Log: beautify source Modified: trunk/ca-management/src/popup.ycp Modified: trunk/ca-management/src/popup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/popup.ycp?rev=… ============================================================================== --- trunk/ca-management/src/popup.ycp (original) +++ trunk/ca-management/src/popup.ycp Fri Oct 12 17:56:48 2007 @@ -14,7 +14,7 @@ import "Wizard"; import "Label"; import "Popup"; - import "YaPI"; + import "YaPI"; import "YaPI::CaManagement"; import "CommandLine"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0