October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41452 - in /branches/tmp/sh/mod-ui/ncurses/src: NCMenuButton.cc NCMenuButton.h NCPopupMenu.cc NCPopupMenu.h
by gs＠svn.opensuse.org 18 Oct '07

18 Oct '07

Author: gs Date: Thu Oct 18 11:53:42 2007 New Revision: 41452 URL: http://svn.opensuse.org/viewcvs/yast?rev=41452&view=rev Log: MenuButton - Part 1 Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.h branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCM… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc Thu Oct 18 11:53:42 2007 @@ -31,18 +31,19 @@ // // DESCRIPTION : // -NCMenuButton::NCMenuButton( YWidget * parent, const YWidgetOpt & opt, - YCPString nlabel ) - : YMenuButton( opt, nlabel ) +NCMenuButton::NCMenuButton( YWidget * parent, + string nlabel ) + : YMenuButton( parent, nlabel ) , NCWidget( parent ) { WIDDBG << endl; setLabel( nlabel ); hotlabel = &label; - if ( opt.isDefaultButton.value() ) - setKeyboardFocus(); - setFunctionHotkey( opt ); + // FIXME + // if ( opt.isDefaultButton.value() ) + // setKeyboardFocus(); + // setFunctionHotkey( opt ); } /////////////////////////////////////////////////////////////////// @@ -58,19 +59,6 @@ WIDDBG << endl; } -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCMenuButton::nicesize -// METHOD TYPE : long -// -// DESCRIPTION : -// -long NCMenuButton::nicesize( YUIDimension dim ) -{ - return dim == YD_HORIZ ? wGetDefsze().W : wGetDefsze().H; -} - int NCMenuButton::preferredWidth() { return wGetDefsze().W; @@ -130,7 +118,7 @@ // // DESCRIPTION : // -void NCMenuButton::setLabel( const YCPString & nlabel ) +void NCMenuButton::setLabel( const string & nlabel ) { label = NCstring( nlabel ); label.stripHotkey(); @@ -168,18 +156,25 @@ win->addch( 0, win->maxx()-1, ACS_DARROW ); } +#if 0 +void NCMenuButton::createMenu() +{ + YMenu * toplevel = getToplevelMenu(); + setEnabled( toplevel && toplevel->hasChildren() ); +} +#endif + /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCMenuButton::createMenu +// METHOD NAME : NCMenuButton::rebuildMenuTree // METHOD TYPE : void // // DESCRIPTION : // -void NCMenuButton::createMenu() +void NCMenuButton::rebuildMenuTree() { - YMenu * toplevel = getToplevelMenu(); - setEnabled( toplevel && toplevel->hasChildren() ); + // NOP } /////////////////////////////////////////////////////////////////// @@ -193,7 +188,9 @@ NCursesEvent NCMenuButton::postMenu() { wpos at( ScreenPos() + wpos( win->height(), 0 ) ); - NCPopupMenu * dialog = new NCPopupMenu( at, *getToplevelMenu() ); + NCPopupMenu * dialog = new NCPopupMenu( at, + itemsBegin(), + itemsEnd() ); int selection = dialog->post(); if ( selection < 0 ) { @@ -203,8 +200,8 @@ NCursesEvent ret = NCursesEvent::menu; // FIXME - check this - YCPValue value = indexToId( selection ); - YStringWidgetID * selectionID = new YStringWidgetID( value->toString()); + dialog->setSelectedItem( findMenuItem( selection ) ); + YStringWidgetID * selectionID = new YStringWidgetID( dialog->selectedItem()->label() ); ret.selection = selectionID; YDialog::deleteTopmostDialog(); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCM… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.h Thu Oct 18 11:53:42 2007 @@ -49,19 +49,18 @@ virtual void wRedraw(); - virtual void createMenu(); NCursesEvent postMenu(); public: - NCMenuButton( YWidget * parent, const YWidgetOpt & opt, - YCPString label ); + NCMenuButton( YWidget * parent, + string label ); virtual ~NCMenuButton(); - virtual long nicesize( YUIDimension dim ); - virtual int preferredWidth(); virtual int preferredHeight(); + + virtual void rebuildMenuTree(); /** * Set the new size of the widget. @@ -72,8 +71,8 @@ virtual NCursesEvent wHandleInput( wint_t key ); - virtual void setLabel( const YCPString & nlabel ); - //virtual void setEnabling( bool do_bv ) { NCWidget::setEnabling( enabled=do_bv ); } + virtual void setLabel( const string & nlabel ); + virtual void setEnabled( bool do_bv ); virtual bool setKeyboardFocus() { Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc Thu Oct 18 11:53:42 2007 @@ -30,16 +30,18 @@ // // DESCRIPTION : // -NCPopupMenu::NCPopupMenu( const wpos at, YMenuItem & menuitem ) +NCPopupMenu::NCPopupMenu( const wpos at, YItemIterator begin, YItemIterator end ) : NCPopupTable( at ) - , menu( menuitem ) + , _selectedItem( 0 ) { vector<string> row( 2 ); createList( row ); - for ( YMenuItemListIterator entry = menu.itemList().begin(); - entry != menu.itemList().end(); ++entry ) { - row[0] = (*entry)->getLabel()->value(); - row[1] = (*entry)->hasChildren() ? "..." : ""; + for ( YItemIterator it = begin; it != end; ++it ) + { + YMenuItem * item = dynamic_cast<YMenuItem *> (*it); + YUI_CHECK_PTR( item ); + row[0] = item->label(); + row[1] = item->hasChildren() ? "..." : ""; /*addItem( (*entry)->getId(), row );*/ } stripHotkeys(); @@ -70,8 +72,9 @@ NCursesEvent ret; switch ( ch ) { case KEY_RIGHT: - if ( menu.itemList()[getCurrentItem()]->hasChildren() ) - ret = NCursesEvent::button; + //if ( menu.itemList()[getCurrentItem()]->hasChildren() ) + if ( selectedItem()->hasChildren() ) + ret = NCursesEvent::button; break; case KEY_LEFT: ret = NCursesEvent::cancel; @@ -100,15 +103,18 @@ : -1; if ( selection != -1 ) { - if ( menu.itemList()[selection]->hasChildren() ) { + if ( _selectedItem && _selectedItem->hasChildren() ) { // post submenu wpos at( ScreenPos() + wpos( selection, inparent.Sze.W - 1 ) ); - NCPopupMenu * dialog = new NCPopupMenu( at, *menu.itemList()[selection] ); + NCPopupMenu * dialog = new NCPopupMenu( at, + _selectedItem->childrenBegin(), + _selectedItem->childrenEnd() ); again = (dialog->post( &postevent ) == NCursesEvent::CONTINUE); YDialog::deleteTopmostDialog(); } else { // store selection - postevent.detail = menu.itemList()[selection]->getIndex(); + //postevent.detail = menu.itemList()[selection]->getIndex(); + postevent.detail = _selectedItem->index(); } } return again; Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h Thu Oct 18 11:53:42 2007 @@ -26,7 +26,6 @@ #include "NCPopupTable.h" -class YMenuItem; /////////////////////////////////////////////////////////////////// // @@ -41,7 +40,7 @@ private: - YMenuItem & menu; + YMenuItem * _selectedItem; protected: @@ -50,12 +49,13 @@ public: - NCPopupMenu( const wpos at, YMenuItem & menuitem ); + NCPopupMenu( const wpos at, YItemIterator begin, YItemIterator end ); virtual ~NCPopupMenu(); // virtual void itemAdded( const YCPString & string, // int index, // bool selected ); - + YMenuItem * selectedItem() { return _selectedItem; } + void setSelectedItem ( YMenuItem * item ) { _selectedItem = item; } }; /////////////////////////////////////////////////////////////////// -- 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] r41451 - in /branches/tmp/sh/mod-ui/ncurses/src: NCIntField.cc NCIntField.h NCLogView.cc NCWidgetFactory.cc YNCursesUI.cc YNCursesUI.h
by gs＠svn.opensuse.org 18 Oct '07

18 Oct '07

Author: gs Date: Thu Oct 18 11:53:06 2007 New Revision: 41451 URL: http://svn.opensuse.org/viewcvs/yast?rev=41451&view=rev Log: ported NCLogView, NCIntField Modified: branches/tmp/sh/mod-ui/ncurses/src/NCIntField.cc branches/tmp/sh/mod-ui/ncurses/src/NCIntField.h branches/tmp/sh/mod-ui/ncurses/src/NCLogView.cc branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCIntField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCI… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCIntField.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCIntField.cc Thu Oct 18 11:53:06 2007 @@ -36,14 +36,13 @@ // // DESCRIPTION : // -NCIntField::NCIntField( YWidget * parent, const YWidgetOpt & opt, - const YCPString & nlabel, +NCIntField::NCIntField( YWidget * parent, + const string & nlabel, int minV, int maxV, int initialV ) - : YIntField( opt, nlabel, + : YIntField( parent, nlabel, minV <= maxV ? minV : maxV, - maxV >= minV ? maxV : minV, - initialV ) + maxV >= minV ? maxV : minV ) , NCWidget( parent ) , lwin( 0 ) , twin( 0 ) @@ -76,19 +75,6 @@ WIDDBG << endl; } -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCIntField::nicesize -// METHOD TYPE : long -// -// DESCRIPTION : -// -long NCIntField::nicesize( YUIDimension dim ) -{ - return dim == YD_HORIZ ? wGetDefsze().W : wGetDefsze().H; -} - int NCIntField::preferredWidth() { return wGetDefsze().W; @@ -194,7 +180,7 @@ // // DESCRIPTION : // -void NCIntField::setLabel( const YCPString & nlabel ) +void NCIntField::setLabel( const string & nlabel ) { label = NCstring( nlabel ); label.stripHotkey(); @@ -211,8 +197,9 @@ // // DESCRIPTION : // -void NCIntField::setValue( int newValue ) +void NCIntField::setValueInternal( int newValue ) { +#if 0 if ( newValue < minValue() ) cvalue = minValue(); else if ( newValue > maxValue() ) @@ -221,6 +208,9 @@ cvalue = newValue; YIntField::setValue( cvalue ); +#endif + // checking newValue is done by YIntField + cvalue = newValue; tUpdate(); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCIntField.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCI… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCIntField.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCIntField.h Thu Oct 18 11:53:06 2007 @@ -70,14 +70,12 @@ public: - NCIntField( YWidget * parent, const YWidgetOpt & opt, - const YCPString & label, + NCIntField( YWidget * parent, + const string & label, int minValue, int maxValue, int initialValue ); virtual ~NCIntField(); - virtual long nicesize( YUIDimension dim ); - virtual int preferredWidth(); virtual int preferredHeight(); @@ -88,10 +86,11 @@ **/ virtual void setSize( int newWidth, int newHeight ); - virtual void setLabel( const YCPString & nlabel ); + virtual void setLabel( const string & nlabel ); - virtual void setValue( int newValue ); + virtual void setValueInternal( int newValue ); + virtual int value() { return cvalue; } virtual NCursesEvent wHandleInput( wint_t key ); virtual bool setKeyboardFocus() { @@ -99,7 +98,7 @@ return YWidget::setKeyboardFocus(); return true; } - //virtual void setEnabling( bool do_bv ) { NCWidget::setEnabling( enabled=do_bv ); } + virtual void setEnabled( bool do_bv ); }; Modified: branches/tmp/sh/mod-ui/ncurses/src/NCLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCL… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCLogView.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCLogView.cc Thu Oct 18 11:53:06 2007 @@ -31,7 +31,7 @@ const string & nlabel, int visibleLines, int maxLines ) - : YLogView( nlabel, visibleLines, maxLines ) + : YLogView( parent, nlabel, visibleLines, maxLines ) , NCPadWidget( parent ) { WIDDBG << endl; @@ -52,20 +52,6 @@ WIDDBG << endl; } -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCLogView::nicesize -// METHOD TYPE : long -// -// DESCRIPTION : -// -long NCLogView::nicesize( YUIDimension dim ) -{ - defsze.W = ( 5 > labelWidht() ? 5 : labelWidht() ) + 2; - return dim == YD_HORIZ ? wGetDefsze().W : wGetDefsze().H; -} - int NCLogView::preferredWidth() { defsze.W = ( 5 > labelWidht() ? 5 : labelWidht() ) + 2; Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCW… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc Thu Oct 18 11:53:06 2007 @@ -200,7 +200,10 @@ NCIntField * NCWidgetFactory::createIntField( YWidget * parent, const string & label, int minVal, int maxVal, int initialVal ) { - return 0; // FIXME: TO DO + NCIntField * intField = new NCIntField( parent, label, minVal, maxVal, initialVal ); + YUI_CHECK_NEW( intField ); + + return intField; } @@ -208,7 +211,10 @@ NCMenuButton * NCWidgetFactory::createMenuButton( YWidget * parent, const string & label ) { - return 0; // FIXME: TO DO + NCMenuButton * menuButton = new NCMenuButton( parent, label ); + YUI_CHECK_NEW( menuButton ); + + return menuButton; } Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/YNC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc Thu Oct 18 11:53:06 2007 @@ -340,30 +340,6 @@ /////////////////////////////////////////////////////////////////// // -// Widget creation functions - leaf widgets -// -/////////////////////////////////////////////////////////////////// - - -YWidget * YNCursesUI::createMenuButton( YWidget * parent, YWidgetOpt & opt, - const YCPString & label ) -{ - ONCREATE; - return new NCMenuButton( parent, opt, label ); -} - - -YWidget * YNCursesUI::createIntField( YWidget * parent, YWidgetOpt & opt, - const YCPString & label, - int minValue, int maxValue, - int initialValue ) -{ - ONCREATE; - return new NCIntField( parent, opt, label, minValue, maxValue, initialValue ); -} - -/////////////////////////////////////////////////////////////////// -// // package selection // /////////////////////////////////////////////////////////////////// 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 Thu Oct 18 11:53:06 2007 @@ -137,22 +137,6 @@ virtual void closeDialog( YDialog * dialog ); /** - * Creates a menu button. - * @param label Label of the button - */ - virtual YWidget * createMenuButton( YWidget * parent, YWidgetOpt & opt, - const YCPString & label ); - - - /** - * Creates an IntField widget. - */ - virtual YWidget * createIntField( YWidget * parent, YWidgetOpt & opt, - const YCPString & label, - int minValue, int maxValue, - int initialValue ); - - /** * Fills the PackageSelector widget. */ virtual YCPValue runPkgSelection( YWidget * packageSelector ); -- 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] r41450 - /trunk/pos-installation/control/installation.xml
by bruclik＠svn.opensuse.org 17 Oct '07

17 Oct '07

Author: bruclik Date: Wed Oct 17 21:52:50 2007 New Revision: 41450 URL: http://svn.opensuse.org/viewcvs/yast?rev=41450&view=rev Log: - installation.xml moved to svn.suse.de/svn/slepos/dist/SUSE/skelcd-slepos/installation.xml Removed: trunk/pos-installation/control/installation.xml -- 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] r41449 - in /trunk/gtk: ChangeLog src/YGPackageSelector.cc
by btimothy＠svn.opensuse.org 17 Oct '07

17 Oct '07

Author: btimothy Date: Wed Oct 17 17:13:44 2007 New Revision: 41449 URL: http://svn.opensuse.org/viewcvs/yast?rev=41449&view=rev Log: 2007-10-17 Boyd Timothy <btimothy(a)novell.com> * src/YGPackageSelector.cc: Fixed the code so it only shows packages that are not installed or have an update. Fixes bug #300737. Also added an enum for the GtkTreeStore columns so the code is easier to read. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelector.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41449&r1=41448… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Oct 17 17:13:44 2007 @@ -1,3 +1,10 @@ +2007-10-17 Boyd Timothy <btimothy(a)novell.com> + + * src/YGPackageSelector.cc: Fixed the code so it only shows + packages that are not installed or have an update. Fixes + bug #300737. Also added an enum for the GtkTreeStore + columns so the code is easier to read. + 2007-10-16 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkhtmlwrapper.h/c (added): to be used instead of YGtkRichText directly. Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Wed Oct 17 17:13:44 2007 @@ -1008,6 +1008,21 @@ // Package selector's widget class PackageSelector : public SourcesTableListener { + +enum package_columns +{ + COL_SELECTABLE = 0, // selectable object (pointer) + COL_INSTALLED_NAME, // installed name (string) + COL_AVAILABLE_NAME, // available_name (string) + COL_IS_INSTALLED, // is installed (boolean) + COL_IS_AVAILABLE, // is available (boolean) + COL_CAN_BE_UPGRADED, // can be upgraded (boolean) + COL_CAN_BE_DOWNGRADED, // can be downgraded (boolean) + COL_SHOW_UPGRADABLE_CONTROL, // show up/downgrade control (boolean) + COL_HAS_CHILDREN, // has children + COL_FONT_STYLE // font style; italic for modified (integer) = 10 +}; + friend class YGPackageSelector; GtkWidget *m_widget; @@ -1332,9 +1347,12 @@ // use the "available" name to do the sorting GtkTreeSortable *sortable = GTK_TREE_SORTABLE (model); - gtk_tree_sortable_set_sort_func (sortable, 2, YGUtils::sort_compare_cb, - GINT_TO_POINTER (2), NULL); - gtk_tree_sortable_set_sort_column_id (sortable, 2, GTK_SORT_ASCENDING); + gtk_tree_sortable_set_sort_func (sortable, COL_AVAILABLE_NAME, + YGUtils::sort_compare_cb, + GINT_TO_POINTER (COL_AVAILABLE_NAME), + NULL); + gtk_tree_sortable_set_sort_column_id (sortable, COL_AVAILABLE_NAME, + GTK_SORT_ASCENDING); gtk_widget_destroy (dialog); } @@ -1601,22 +1619,13 @@ } bool has_up = false, has_down = false; - if (available_obj != NULL) { - for (zypp::ui::Selectable::available_iterator it = selectable->availableBegin(); - it != selectable->availableEnd(); it++) { -#ifdef PRE_ZYPP_3 - if (!(*it)->source().enabled()) -#else - if (!(*it)->repository().info().enabled()) -#endif - continue; - int res = zypp::Edition::compare ((*it)->edition(), - available_obj->edition()); - if (res < 0) - has_down = true; - else if (res > 0) - has_up = true; - } + if (available_obj != NULL && install_obj != NULL) { + int res = zypp::Edition::compare (install_obj->edition(), + available_obj->edition()); + if (res < 0) + has_up = true; + else if (res > 0) + has_down = true; } if (has_upgrade) @@ -1630,7 +1639,7 @@ ZyppSelectable selectable) { ZyppObject install_obj, available_obj; - bool has_upgrade, has_downgrade; + bool has_upgrade, has_downgrade, has_children = FALSE; induceObjects (selectable, install_obj, available_obj, &has_upgrade, &has_downgrade); @@ -1645,11 +1654,13 @@ else { ZyppPattern pattern = tryCastToZyppPattern (available_obj); ZyppLanguage lang = tryCastToZyppLanguage (available_obj); - if (pattern) + if (pattern) { availableName = "<b>" + fastGetSummary (available_obj) + "</b>"; - else if (lang) + has_children = TRUE; + } else if (lang) { availableName = "<b>" + available_obj->description() + "</b>"; - else + has_children = TRUE; + } else availableName = name + " (" + available_obj->edition().version() + ")"; } } @@ -1661,14 +1672,24 @@ else { ZyppPattern pattern = tryCastToZyppPattern (install_obj); ZyppLanguage lang = tryCastToZyppLanguage (install_obj); - if (pattern) + if (pattern) { installedName = "<b>" + fastGetSummary (install_obj) + "</b>"; - else if (lang) + has_children = TRUE; + } else if (lang) { installedName = "<b>" + install_obj->description() + "</b>"; - else + has_children = TRUE; + } else installedName = name + " (" + install_obj->edition().version() + ")"; } } + + // Make sure that both the availableName and installedName + // are filled. Occasionally, the names are empty, so the + // following checks make sure these variable are filled. + if (availableName.empty()) + availableName = installedName; + else if (installedName.empty()) + installedName = availableName; PangoStyle style = PANGO_STYLE_NORMAL; if (selectable->toModify()) @@ -1677,14 +1698,28 @@ // oh, would be nice to have a common set for tree models... if (GTK_IS_LIST_STORE (model)) gtk_list_store_set (GTK_LIST_STORE (model), iter, - 0, get_pointer (selectable), 1, installedName.c_str(), - 2, availableName.c_str(), 3, install_obj != 0, 4, available_obj != 0, - 5, has_upgrade, 6, has_downgrade, 7, detailed, 8, FALSE, 9, style, -1); + COL_SELECTABLE, get_pointer (selectable), + COL_INSTALLED_NAME, installedName.c_str(), + COL_AVAILABLE_NAME, availableName.c_str(), + COL_IS_INSTALLED, install_obj != 0, + COL_IS_AVAILABLE, available_obj != 0, + COL_CAN_BE_UPGRADED, has_upgrade, + COL_CAN_BE_DOWNGRADED, has_downgrade, + COL_SHOW_UPGRADABLE_CONTROL, detailed, + COL_HAS_CHILDREN, has_children, + COL_FONT_STYLE, style, -1); else /*if (GTK_IS_TREE_STORE (model))*/ gtk_tree_store_set (GTK_TREE_STORE (model), iter, - 0, get_pointer (selectable), 1, installedName.c_str(), - 2, availableName.c_str(), 3, install_obj != 0, 4, available_obj != 0, - 5, has_upgrade, 6, has_downgrade, 7, detailed, 8, FALSE, 9, style, -1); + COL_SELECTABLE, get_pointer (selectable), + COL_INSTALLED_NAME, installedName.c_str(), + COL_AVAILABLE_NAME, availableName.c_str(), + COL_IS_INSTALLED, install_obj != 0, + COL_IS_AVAILABLE, available_obj != 0, + COL_CAN_BE_UPGRADED, has_upgrade, + COL_CAN_BE_DOWNGRADED, has_downgrade, + COL_SHOW_UPGRADABLE_CONTROL, detailed, + COL_HAS_CHILDREN, has_children, + COL_FONT_STYLE, style, -1); /* y2milestone ("set %s: %d - %d\n", selectable->name().c_str(), available_obj != 0, install_obj != 0);*/ } @@ -1787,7 +1822,7 @@ ZyppSelectablePtr sel = NULL; - gtk_tree_model_get (model, iter, 0, &sel, -1); + gtk_tree_model_get (model, iter, COL_SELECTABLE, &sel, -1); if (!sel) return FALSE; @@ -1886,8 +1921,9 @@ gboolean visible, has_children; ZyppSelectablePtr selectable; - gtk_tree_model_get (model, iter, visible_col, &visible, 8, &has_children, - 0, &selectable, -1); + gtk_tree_model_get (model, iter, visible_col, &visible, + COL_HAS_CHILDREN, &has_children, + COL_SELECTABLE, &selectable, -1); // fprintf (stderr, "is visible '%s'\n", selectable ? selectable->name().c_str() : "<noname>"); if (has_children) @@ -1904,7 +1940,29 @@ static gboolean is_package_available (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) - { return is_package_visible (model, iter, (PackageSelector *) data, 4); } + { + gboolean is_installed, is_available, has_upgrade, has_children; + gboolean visible = TRUE; + ZyppSelectablePtr selectable; + PackageSelector *pThis = (PackageSelector *) data; + + // only show the packages that aren't installed + // unless there's an upgrade available + gtk_tree_model_get (model, iter, COL_SELECTABLE, &selectable, + COL_IS_INSTALLED, &is_installed, + COL_IS_AVAILABLE, &is_available, + COL_CAN_BE_UPGRADED, &has_upgrade, + COL_HAS_CHILDREN, &has_children, -1); + if (!has_children) { + if (is_available && (!is_installed || has_upgrade)) { + if (!pThis->m_search_queries.empty()) + visible = pThis->does_package_match (selectable); + } else + visible = FALSE; + } + + return visible; + } bool does_package_match_one (ZyppSelectablePtr sel, string key) { @@ -1974,7 +2032,7 @@ GtkTreeModel *model = gtk_tree_view_get_model (tree_view); GtkTreeIter iter; gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_model_get (model, &iter, 0, package_sel, -1); + gtk_tree_model_get (model, &iter, COL_SELECTABLE, package_sel, -1); if (_path) *_path = gtk_tree_model_filter_convert_path_to_child_path (GTK_TREE_MODEL_FILTER (model), path); @@ -2180,7 +2238,7 @@ for (i = 0; i < selected_len; i++) { GtkTreeIter *iter = &iters[i]; ZyppSelectablePtr sel = 0; - gtk_tree_model_get (model, iter, 0, &sel, -1); + gtk_tree_model_get (model, iter, COL_SELECTABLE, &sel, -1); if (sel && mark_selectable (sel, installed) /* install/remove */) { loadPackageRow (model, iter, sel); // update model @@ -2188,7 +2246,7 @@ GtkTreeIter child; if (gtk_tree_model_iter_children (model, &child, iter)) { do { - gtk_tree_model_get (model, &child, 0, &sel, -1); + gtk_tree_model_get (model, &child, COL_SELECTABLE, &sel, -1); if (sel && mark_selectable (sel, installed)) loadPackageRow (model, &child, sel); } while (gtk_tree_model_iter_next (model, &child)); @@ -2235,7 +2293,7 @@ model = pThis->m_packages_model; ZyppSelectablePtr selectable; - gtk_tree_model_get (model, &iter, 0, &selectable, -1); + gtk_tree_model_get (model, &iter, COL_SELECTABLE, &selectable, -1); ZyppObject candidate = selectable->candidateObj(); for (zypp::ui::Selectable::available_iterator it = selectable->availableBegin(); @@ -2261,7 +2319,7 @@ GtkTreeIter iter; if (gtk_tree_model_get_iter (model, &iter, path)) { ZyppSelectablePtr selectable; - gtk_tree_model_get (model, &iter, 0, &selectable, -1); + gtk_tree_model_get (model, &iter, COL_SELECTABLE, &selectable, -1); return selectable != NULL; } return FALSE; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41448 - in /branches/tmp/sh/mod-ui/ncurses/src: NCLogView.cc NCLogView.h NCWidgetFactory.cc YNCursesUI.cc YNCursesUI.h
by gs＠svn.opensuse.org 17 Oct '07

17 Oct '07

Author: gs Date: Wed Oct 17 14:43:40 2007 New Revision: 41448 URL: http://svn.opensuse.org/viewcvs/yast?rev=41448&view=rev Log: adapt LogView widget Modified: branches/tmp/sh/mod-ui/ncurses/src/NCLogView.cc branches/tmp/sh/mod-ui/ncurses/src/NCLogView.h branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCL… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCLogView.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCLogView.cc Wed Oct 17 14:43:40 2007 @@ -27,11 +27,11 @@ // // DESCRIPTION : // -NCLogView::NCLogView( YWidget * parent, const YWidgetOpt & opt, - const YCPString & nlabel, +NCLogView::NCLogView( YWidget * parent, + const string & nlabel, int visibleLines, int maxLines ) - : YLogView( opt, nlabel, visibleLines, maxLines ) + : YLogView( nlabel, visibleLines, maxLines ) , NCPadWidget( parent ) { WIDDBG << endl; @@ -104,7 +104,7 @@ // // DESCRIPTION : // -void NCLogView::setLabel( const YCPString & nlabel ) +void NCLogView::setLabel( const string & nlabel ) { YLogView::setLabel( nlabel ); NCPadWidget::setLabel( NCstring( nlabel ) ); @@ -113,12 +113,12 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCLogView::setLogText +// METHOD NAME : NCLogView::displayLogText // METHOD TYPE : void // // DESCRIPTION : // -void NCLogView::setLogText( const YCPString & ntext ) +void NCLogView::displayLogText( const string & ntext ) { DelPad(); text = NCtext( NCstring(ntext), Columns() ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCLogView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCL… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCLogView.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCLogView.h Wed Oct 17 14:43:40 2007 @@ -55,14 +55,12 @@ public: - NCLogView( YWidget * parent, const YWidgetOpt & opt, - const YCPString & label, + NCLogView( YWidget * parent, + const string & label, int visibleLines, int maxLines ); virtual ~NCLogView(); - virtual long nicesize( YUIDimension dim ); - virtual int preferredWidth(); virtual int preferredHeight(); @@ -73,8 +71,8 @@ **/ virtual void setSize( int newWidth, int newHeight ); - virtual void setLabel( const YCPString & nlabel ); - virtual void setLogText( const YCPString & ntext); + virtual void setLabel( const string & nlabel ); + virtual void displayLogText( const string & ntext); virtual NCursesEvent wHandleInput( wint_t key ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCW… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc Wed Oct 17 14:43:40 2007 @@ -225,7 +225,10 @@ NCLogView * NCWidgetFactory::createLogView( YWidget * parent, const string & label, int visibleLines, int storedLines ) { - return 0; // FIXME: TO DO + NCLogView * logView = new NCLogView( parent, label, visibleLines, storedLines ); + YUI_CHECK_NEW( logView ); + + return logView; } Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/YNC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc Wed Oct 17 14:43:40 2007 @@ -345,16 +345,6 @@ /////////////////////////////////////////////////////////////////// -YWidget * YNCursesUI::createLogView( YWidget * parent, YWidgetOpt & opt, - const YCPString & label, - int visibleLines, - int maxLines ) -{ - ONCREATE; - return new NCLogView( parent, opt, label, visibleLines, maxLines ); -} - - YWidget * YNCursesUI::createMenuButton( YWidget * parent, YWidgetOpt & opt, const YCPString & label ) { 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 Wed Oct 17 14:43:40 2007 @@ -137,17 +137,6 @@ virtual void closeDialog( YDialog * dialog ); /** - * Creates a log view widget - * @param label label above the log view - * @param visibleLines default number of vislible lines - * @param maxLines number of lines to store (use 0 for "all") - */ - virtual YWidget * createLogView( YWidget * parent, YWidgetOpt & opt, - const YCPString & label, - int visibleLines, - int maxLines ); - - /** * Creates a menu button. * @param label Label of the button */ -- 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] r41447 - /tags/branch-SLE-10-SP1-2_13_16/product-creator/
by jsuchome＠svn.opensuse.org 17 Oct '07

17 Oct '07

Author: jsuchome Date: Wed Oct 17 13:29:27 2007 New Revision: 41447 URL: http://svn.opensuse.org/viewcvs/yast?rev=41447&view=rev Log: Created tag branch-SLE-10-SP1-2_13_16 for product-creator Added: tags/branch-SLE-10-SP1-2_13_16/product-creator/ - copied from r41446, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- 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] r41446 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 17 Oct '07

17 Oct '07

Author: jsuchome Date: Wed Oct 17 13:29:09 2007 New Revision: 41446 URL: http://svn.opensuse.org/viewcvs/yast?rev=41446&view=rev Log: - fix modifying of repository (#334208) - check for duplicates in the list of boot images (#332581) - disable Delete button when there's nothing to delete (#334255) - 2.13.16 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Wed Oct 17 13:29:09 2007 @@ -1 +1 @@ -2.13.15 +2.13.16 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Wed Oct 17 13:29:09 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Oct 16 23:37:05 CEST 2007 - jsuchome(a)suse.cz + +- fix modifying of repository (#334208) +- check for duplicates in the list of boot images (#332581) +- disable Delete button when there's nothing to delete (#334255) +- 2.13.16 + +------------------------------------------------------------------- Mon Oct 15 16:41:48 CEST 2007 - jsuchome(a)suse.cz - update defaultroot only for new configurations (#327057) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Wed Oct 17 13:29:09 2007 @@ -1533,11 +1533,15 @@ if (type_its != []) type_items = type_its; } - if (!contains (["iso", "xen", "usb", "vmx"], kiwi_task)) - type_items = add (type_items, - `item (`id (kiwi_task), task2label[kiwi_task]:kiwi_task, true)); list present_types = maplist ( term it, (list<term>)type_items, ``(it[0,0]:"")); + if (!contains (["iso", "xen", "usb", "vmx"], kiwi_task) && + !contains (present_types, kiwi_task)) + { + type_items = add (type_items, + `item (`id (kiwi_task), task2label[kiwi_task]:kiwi_task, true)); + present_types = add (present_types, kiwi_task); + } // on start, show the default YaST sources if (Config["sources"]:[] != [] && repositories == $[]) @@ -1558,6 +1562,7 @@ string url, map repo, repositories, ``( `item (`id (url), url)) )); + UI::ChangeWidget (`id (`delete), `Enabled, size (repositories) > 0); } // read the new configuration and update UI accordingly @@ -1801,10 +1806,10 @@ url = URL::Build (parsed); } url = SourceDialogs::EditPopup (url); - if (url == "" || url == nil || url == selected_url); + if (url == "" || url == nil || url == selected_url) continue; // remove current url + add new one - repositories = remove (repositories, url); + repositories = remove (repositories, selected_url); map parsed = URL::Parse(url); if (parsed["scheme"]:"" == "pkg") { @@ -1821,6 +1826,8 @@ { string selected = (string) UI::QueryWidget (`id (`repositories), `CurrentItem); + if (selected == nil) + continue; repositories = remove (repositories, selected); update_repo_table (); } -- 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] r41445 - in /trunk/gtk/src: ygtkhtmlwrap.c ygtkhtmlwrap.h
by rpmcruz＠svn.opensuse.org 16 Oct '07

16 Oct '07

Author: rpmcruz Date: Tue Oct 16 18:23:08 2007 New Revision: 41445 URL: http://svn.opensuse.org/viewcvs/yast?rev=41445&view=rev Log: Forgot to add these. Added: trunk/gtk/src/ygtkhtmlwrap.c trunk/gtk/src/ygtkhtmlwrap.h Added: trunk/gtk/src/ygtkhtmlwrap.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkhtmlwrap.c?rev=41445… ============================================================================== --- trunk/gtk/src/ygtkhtmlwrap.c (added) +++ trunk/gtk/src/ygtkhtmlwrap.c Tue Oct 16 18:23:08 2007 @@ -0,0 +1,170 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* YGtkHtmlWrap widget */ +// check the header file for information about this widget + +#include <config.h> +#include <gtk/gtkversion.h> +#include <string.h> +#include "ygtkhtmlwrap.h" + +GtkWidget *ygtk_html_wrap_new (void) +{ + return g_object_new (ygtk_html_wrap_get_type(), NULL); +} + + +// Utilities +static inline void adjust_scroll (GtkAdjustment *vadj, gboolean top) +{ + g_assert (vadj != 0); + if (top) + gtk_adjustment_set_value (vadj, vadj->lower); + else /* bottom */ + gtk_adjustment_set_value (vadj, vadj->upper - vadj->page_size); +} + +static void gdkwindow_set_background (GdkWindow *window, const char *image) +{ + if (image) { + GError *error = 0; + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (image, &error); + if (!pixbuf) { + g_warning ("ygtkrichtext: could not open background image: '%s'" + " - %s", image, error->message); + return; + } + + GdkPixmap *pixmap; + gdk_pixbuf_render_pixmap_and_mask_for_colormap (pixbuf, + gdk_drawable_get_colormap (GDK_DRAWABLE (window)), &pixmap, NULL, 0); + g_object_unref (G_OBJECT (pixbuf)); + + gdk_window_set_back_pixmap (window, pixmap, FALSE); + } + else + gdk_window_clear (window); +} + +// GtkHTML +#ifdef USE_GTKHTML +#include <libgtkhtml-3.14/gtkhtml/gtkhtml.h> +#include <libgtkhtml-3.14/gtkhtml/gtkhtml-stream.h> +#include <libgtkhtml-3.14/gtkhtml/gtkhtml-search.h> + +GType ygtk_html_wrap_get_type (void) +{ + return GTK_TYPE_HTML; +} + +static void gtkhtml_url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *stream) +{ // to load images (and possibly other external embed files) + FILE *file = fopen (url, "rb"); + + fseek (file, 0, SEEK_END); + size_t file_size = ftell (file); + rewind (file); + + gboolean error; + gchar *data = g_new (gchar, file_size); + error = fread (data, 1, file_size, file) < file_size; + fclose (file); + + if (!error) + gtk_html_stream_write (stream, data, file_size); + g_free (data); +} + +void ygtk_html_wrap_init (GtkWidget *widget) +{ + gtk_html_set_editable (GTK_HTML (widget), FALSE); + g_signal_connect (G_OBJECT (widget), "url-requested", + G_CALLBACK (gtkhtml_url_requested_cb), NULL); +} + +void ygtk_html_wrap_set_text (GtkWidget *widget, const gchar* text) +{ + GtkHTMLStream *stream = gtk_html_begin (GTK_HTML (widget)); + gtk_html_write (GTK_HTML (widget), stream, text, strlen (text)); + gtk_html_end (GTK_HTML (widget), stream, GTK_HTML_STREAM_OK); +} + +void ygtk_html_wrap_scroll (GtkWidget *widget, gboolean top) +{ + adjust_scroll (GTK_LAYOUT (widget)->vadjustment, top); +} + +gboolean ygtk_html_wrap_search (GtkWidget *widget, const gchar *text) +{ +/* if (*text == '\0') + return TRUE;*/ + return gtk_html_engine_search (GTK_HTML (widget), text, FALSE, TRUE, FALSE); +} + +gboolean ygtk_html_wrap_search_next (GtkWidget *widget, const gchar *text) +{ + return gtk_html_engine_search_next (GTK_HTML (widget)); +} + +void ygtk_html_wrap_connect_link_clicked (GtkWidget *widget, GCallback callback, gpointer data) +{ + g_signal_connect (G_OBJECT (widget), "link-clicked", callback, data); +} + +void ygtk_html_wrap_set_background (GtkWidget *widget, const char *image) +{ + // TODO +} + +// YGtkRichText +#else +#include "ygtkrichtext.h" + +GType ygtk_html_wrap_get_type() +{ + return YGTK_TYPE_RICH_TEXT; +} + +void ygtk_html_wrap_init (GtkWidget *widget) +{ +} + +void ygtk_html_wrap_set_text (GtkWidget *widget, const gchar* text) +{ + ygtk_rich_text_set_text (YGTK_RICH_TEXT (widget), text, TRUE); +} + +void ygtk_html_wrap_scroll (GtkWidget *widget, gboolean top) +{ + adjust_scroll (GTK_TEXT_VIEW (widget)->vadjustment, top); +} + +gboolean ygtk_html_wrap_search (GtkWidget *widget, const gchar *text) +{ + gboolean ret = ygtk_rich_text_mark_text (YGTK_RICH_TEXT (widget), text); + ygtk_rich_text_forward_mark (YGTK_RICH_TEXT (widget), text); + return ret; +} + +gboolean ygtk_html_wrap_search_next (GtkWidget *widget, const gchar *text) +{ + return ygtk_rich_text_forward_mark (YGTK_RICH_TEXT (widget), text); +} + +void ygtk_html_wrap_connect_link_clicked (GtkWidget *widget, GCallback callback, gpointer data) +{ + g_signal_connect (G_OBJECT (widget), "link-clicked", callback, data); +} + +void ygtk_html_wrap_set_background (GtkWidget *widget, const char *image) +{ + g_return_if_fail (GTK_WIDGET_REALIZED (widget)); + GdkWindow *window = gtk_text_view_get_window + (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_TEXT); + gdkwindow_set_background (window, image); +} + +#endif + Added: trunk/gtk/src/ygtkhtmlwrap.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkhtmlwrap.h?rev=41445… ============================================================================== --- trunk/gtk/src/ygtkhtmlwrap.h (added) +++ trunk/gtk/src/ygtkhtmlwrap.h Tue Oct 16 18:23:08 2007 @@ -0,0 +1,37 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* YGtkHtmlWrap is a wrapper around either GtkHtml and YGtkRichText, as + set at compilation time. GtkHtml is superior, but to avoid dependencies, + we use our customized in case it isn't installed. + If you flag it as plain_text, it will simply wrap GtkTextView. +*/ + +#ifndef YGTK_HTML_WRAP_H +#define YGTK_HTML_WRAP_H + +#include <gtk/gtkwidget.h> +G_BEGIN_DECLS + +GtkWidget *ygtk_html_wrap_new (void); + +GType ygtk_html_wrap_get_type (void); +void ygtk_html_wrap_init (GtkWidget *widget); // if you use g_object_new(), call this + +void ygtk_html_wrap_set_text (GtkWidget *widget, const gchar* text); +void ygtk_html_wrap_scroll (GtkWidget *widget, gboolean top /* or bottom */); + +// callback of type: void (GtkWidget *htmlwrap, const gchar *url, gpointer data) +void ygtk_html_wrap_connect_link_clicked (GtkWidget *widget, GCallback callback, gpointer data); + +// not supported on plain text +gboolean ygtk_html_wrap_search (GtkWidget *widget, const gchar *text); +gboolean ygtk_html_wrap_search_next (GtkWidget *widget, const gchar *text); // F3 + +// set a background image -- to be done on (or after) realize +void ygtk_html_wrap_set_background (GtkWidget *widget, const char *image); + +G_END_DECLS +#endif /* YGTK_HTML_WRAP_H */ + -- 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] r41444 - /trunk/gtk/src/YGRichText.cc
by rpmcruz＠svn.opensuse.org 16 Oct '07

16 Oct '07

Author: rpmcruz Date: Tue Oct 16 17:59:59 2007 New Revision: 41444 URL: http://svn.opensuse.org/viewcvs/yast?rev=41444&view=rev Log: Forgot to remove YGRichText.cc Removed: trunk/gtk/src/YGRichText.cc -- 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] r41443 - in /trunk/gtk/mockups: ./ package-selector/ wizard-look/
by rpmcruz＠svn.opensuse.org 16 Oct '07

16 Oct '07

Author: rpmcruz Date: Tue Oct 16 16:48:55 2007 New Revision: 41443 URL: http://svn.opensuse.org/viewcvs/yast?rev=41443&view=rev Log: Moved wizard look mockups to their own folder. Added a package selector folder with some mockups from people. We need to add the texts that describe them... Added: trunk/gtk/mockups/package-selector/ trunk/gtk/mockups/package-selector/christian-package-selector.png (with props) trunk/gtk/mockups/package-selector/christian-patterns.png (with props) trunk/gtk/mockups/package-selector/martin-package-selector-1.gif (with props) trunk/gtk/mockups/wizard-look/ trunk/gtk/mockups/wizard-look/jakub-installer-mockup.jpg (with props) trunk/gtk/mockups/wizard-look/jakub-mockup.svg trunk/gtk/mockups/wizard-look/ricardo-installer-mockup.svg Removed: trunk/gtk/mockups/jakub-installer-mockup.jpg trunk/gtk/mockups/jakub-mockup.svg trunk/gtk/mockups/ricardo-installer-mockup.svg Added: trunk/gtk/mockups/package-selector/christian-package-selector.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/mockups/package-selector/chr… ============================================================================== Binary file - no diff available. Added: trunk/gtk/mockups/package-selector/christian-patterns.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/mockups/package-selector/chr… ============================================================================== Binary file - no diff available. Added: trunk/gtk/mockups/package-selector/martin-package-selector-1.gif URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/mockups/package-selector/mar… ============================================================================== Binary file - no diff available. Added: trunk/gtk/mockups/wizard-look/jakub-installer-mockup.jpg URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/mockups/wizard-look/jakub-in… ============================================================================== Binary file - no diff available. Added: trunk/gtk/mockups/wizard-look/jakub-mockup.svg URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/mockups/wizard-look/jakub-mo… ============================================================================== --- trunk/gtk/mockups/wizard-look/jakub-mockup.svg (added) +++ trunk/gtk/mockups/wizard-look/jakub-mockup.svg Tue Oct 16 16:48:55 2007 @@ -0,0 +1,348 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="512" + height="512" + id="svg3164" + sodipodi:version="0.32" + inkscape:version="0.45.1" + version="1.0" + sodipodi:docbase="/home/jimmac/gfx/suse" + sodipodi:docname="yast-face-mockup.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:export-filename="/home/jimmac/gfx/suse/yast-face-mockup.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs3166"> + <linearGradient + id="linearGradient9896"> + <stop + style="stop-color:#cecece;stop-opacity:1;" + offset="0" + id="stop9898" /> + <stop + style="stop-color:#9e9e9e;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop9900" /> + </linearGradient> + <linearGradient + id="linearGradient9868"> + <stop + id="stop9870" + offset="0.0000000" + style="stop-color:#4e4e4e;stop-opacity:1.0000000;" /> + <stop + id="stop9872" + offset="1.0000000" + style="stop-color:#616161;stop-opacity:0.0000000;" /> + </linearGradient> + <linearGradient + id="linearGradient9854"> + <stop + style="stop-color:#4e4e4e;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop9856" /> + <stop + style="stop-color:#ababab;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop9858" /> + </linearGradient> + <linearGradient + id="linearGradient9830"> + <stop + style="stop-color:#505050;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop9832" /> + <stop + style="stop-color:#181818;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop9834" /> + </linearGradient> + <linearGradient + id="linearGradient3800"> + <stop + id="stop3802" + offset="0.0000000" + style="stop-color:#f4d9b1;stop-opacity:1.0000000;" /> + <stop + id="stop3804" + offset="1.0000000" + style="stop-color:#df9725;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + id="linearGradient4163"> + <stop + id="stop4165" + offset="0.0000000" + style="stop-color:#3b74bc;stop-opacity:1.0000000;" /> + <stop + id="stop4167" + offset="1.0000000" + style="stop-color:#2d5990;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + id="linearGradient3824"> + <stop + id="stop3826" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop3828" + offset="1.0000000" + style="stop-color:#c9c9c9;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + id="linearGradient4338"> + <stop + style="stop-color:#e9b15e;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop4340" /> + <stop + style="stop-color:#966416;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop4342" /> + </linearGradient> + <linearGradient + id="linearGradient4344"> + <stop + id="stop4346" + offset="0" + style="stop-color:#727e0a;stop-opacity:1;" /> + <stop + id="stop4348" + offset="1.0000000" + style="stop-color:#5b6508;stop-opacity:1.0000000;" /> + </linearGradient> + <filter + inkscape:collect="always" + x="-0.016093679" + width="1.0321873" + y="-0.12716499" + height="1.25433" + id="filter6146"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="0.68335658" + id="feGaussianBlur6148" /> + </filter> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5749" + id="linearGradient5212" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.560438,0,0,1,-180.35099,80.000027)" + x1="527.00006" + y1="337.49994" + x2="527.00006" + y2="349.99997" /> + <linearGradient + id="linearGradient5749"> + <stop + style="stop-color:#eeeeec;stop-opacity:1;" + offset="0" + id="stop5751" /> + <stop + style="stop-color:#dcdcd8;stop-opacity:1;" + offset="1" + id="stop5753" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5749" + id="linearGradient5218" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.736263,0,0,1,10.989174,79.000022)" + x1="527.00006" + y1="337.49994" + x2="527.00006" + y2="349.99997" /> + <linearGradient + id="linearGradient6107"> + <stop + style="stop-color:#3465a4;stop-opacity:1" + offset="0" + id="stop6109" /> + <stop + id="stop6115" + offset="0.5" + style="stop-color:#83a6d9;stop-opacity:1;" /> + <stop + style="stop-color:#3465a4;stop-opacity:1" + offset="1" + id="stop6111" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient6107" + id="linearGradient6113" + x1="196.5" + y1="263" + x2="602.5" + y2="263" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9160495,0,0,2.1052305,-103.9617,-168.61518)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + gridtolerance="10000" + guidetolerance="10" + objecttolerance="10" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="241.72408" + inkscape:cy="244.38808" + inkscape:document-units="px" + inkscape:current-layer="layer1" + width="512px" + height="512px" + borderlayer="true" + inkscape:showpageshadow="false" + showgrid="false" + inkscape:window-width="1083" + inkscape:window-height="908" + inkscape:window-x="149" + inkscape:window-y="0" /> + <metadata + id="metadata3169"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <rect + style="opacity:1;color:#000000;fill:url(#linearGradient6113);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect5220" + width="371" + height="386.85565" + x="76.5" + y="56.644333" + rx="4.5823212" + ry="4.5823212" /> + <rect + style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect5138" + width="366" + height="355" + x="79" + y="86" + rx="0" + ry="0" /> + <rect + style="color:#000000;fill:url(#linearGradient5218);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:2.99999976;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect5140" + width="66.999771" + height="24.000029" + x="365.5" + y="404.49997" + rx="2.9687498" + ry="2.96875" /> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans" + x="385.99982" + y="421.00003" + id="text5142"><tspan + sodipodi:role="line" + id="tspan5144" + x="385.99982" + y="421.00003">Next</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" + d="M 386.96852,422.50002 L 392.90602,422.50002" + id="path5170" /> + <rect + ry="2.96875" + rx="2.9687474" + y="405.49997" + x="89.5" + height="24.000029" + width="50.999733" + id="rect5180" + style="color:#000000;fill:url(#linearGradient5212);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.99999958;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <text + id="text5182" + y="422.00003" + x="101.99992" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans" + xml:space="preserve"><tspan + y="422.00003" + x="101.99992" + id="tspan5184" + sodipodi:role="line">Help</tspan></text> + <path + id="path5186" + d="M 103.49993,423.50002 L 108.49993,423.50002" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" /> + <text + sodipodi:linespacing="125%" + id="text6122" + y="56.362183" + x="203.67383" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:0.49714284;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;filter:url(#filter6146);font-family:Segoe" + xml:space="preserve" + transform="matrix(1.18725,0,0,1.18725,-40.3025,10.144894)"><tspan + y="56.362183" + x="203.67383" + id="tspan6124" + sodipodi:role="line">Hardware Setup</tspan></text> + <text + xml:space="preserve" + style="font-size:14.24700165px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Trebuchet MS" + x="201.50928" + y="75.873657" + id="text6118" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan6120" + x="201.50928" + y="75.873657">Hardware Setup</tspan></text> + <g + id="g4295" + transform="translate(3.330917,-21.00005)"> + <text + id="text4287" + y="136.00006" + x="88.071426" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans" + xml:space="preserve"><tspan + y="136.00006" + x="88.071426" + id="tspan4289" + sodipodi:role="line">Choose Driver:</tspan></text> + <path + id="path4291" + d="M 89.510984,137.50005 L 95.411632,137.50005" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" /> + </g> + <rect + style="fill:#ffffff;stroke:#babdb6;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" + id="rect4293" + width="344" + height="265.99997" + x="89.5" + y="125.50002" + rx="2.9687476" + ry="2.96875" /> + </g> +</svg> Added: trunk/gtk/mockups/wizard-look/ricardo-installer-mockup.svg URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/mockups/wizard-look/ricardo-… ============================================================================== --- trunk/gtk/mockups/wizard-look/ricardo-installer-mockup.svg (added) +++ trunk/gtk/mockups/wizard-look/ricardo-installer-mockup.svg Tue Oct 16 16:48:55 2007 @@ -0,0 +1,378 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="512" + height="512" + id="svg3164" + sodipodi:version="0.32" + inkscape:version="0.44.1" + version="1.0" + sodipodi:docbase="/home/rick2" + sodipodi:docname="installer-mockup.svg" + inkscape:export-filename="/home/jimmac/gfx/suse/yast-face-mockup.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs3166"> + <linearGradient + id="linearGradient9896"> + <stop + style="stop-color:#cecece;stop-opacity:1;" + offset="0" + id="stop9898" /> + <stop + style="stop-color:#9e9e9e;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop9900" /> + </linearGradient> + <linearGradient + id="linearGradient9868"> + <stop + id="stop9870" + offset="0.0000000" + style="stop-color:#4e4e4e;stop-opacity:1.0000000;" /> + <stop + id="stop9872" + offset="1.0000000" + style="stop-color:#616161;stop-opacity:0.0000000;" /> + </linearGradient> + <linearGradient + id="linearGradient9854"> + <stop + style="stop-color:#4e4e4e;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop9856" /> + <stop + style="stop-color:#ababab;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop9858" /> + </linearGradient> + <linearGradient + id="linearGradient9830"> + <stop + style="stop-color:#505050;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop9832" /> + <stop + style="stop-color:#181818;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop9834" /> + </linearGradient> + <linearGradient + id="linearGradient3800"> + <stop + id="stop3802" + offset="0.0000000" + style="stop-color:#f4d9b1;stop-opacity:1.0000000;" /> + <stop + id="stop3804" + offset="1.0000000" + style="stop-color:#df9725;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + id="linearGradient4163"> + <stop + id="stop4165" + offset="0.0000000" + style="stop-color:#3b74bc;stop-opacity:1.0000000;" /> + <stop + id="stop4167" + offset="1.0000000" + style="stop-color:#2d5990;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + id="linearGradient3824"> + <stop + id="stop3826" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop3828" + offset="1.0000000" + style="stop-color:#c9c9c9;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + id="linearGradient4338"> + <stop + style="stop-color:#e9b15e;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop4340" /> + <stop + style="stop-color:#966416;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop4342" /> + </linearGradient> + <linearGradient + id="linearGradient4344"> + <stop + id="stop4346" + offset="0" + style="stop-color:#727e0a;stop-opacity:1;" /> + <stop + id="stop4348" + offset="1.0000000" + style="stop-color:#5b6508;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5749" + id="linearGradient5212" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.560438,0,0,1,-81.05688,145.6536)" + x1="527.00006" + y1="337.49994" + x2="527.00006" + y2="349.99997" /> + <linearGradient + id="linearGradient5749"> + <stop + style="stop-color:#eeeeec;stop-opacity:1;" + offset="0" + id="stop5751" /> + <stop + style="stop-color:#dcdcd8;stop-opacity:1;" + offset="1" + id="stop5753" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5749" + id="linearGradient5218" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.736263,0,0,1,68.94996,149)" + x1="527.00006" + y1="337.49994" + x2="527.00006" + y2="349.99997" /> + <linearGradient + id="linearGradient6107"> + <stop + style="stop-color:#3465a4;stop-opacity:1" + offset="0" + id="stop6109" /> + <stop + id="stop6115" + offset="0.5" + style="stop-color:#83a6d9;stop-opacity:1;" /> + <stop + style="stop-color:#3465a4;stop-opacity:1" + offset="1" + id="stop6111" /> + </linearGradient> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + gridtolerance="10000" + guidetolerance="10" + objecttolerance="10" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.1953125" + inkscape:cx="256" + inkscape:cy="271.20829" + inkscape:document-units="px" + inkscape:current-layer="layer1" + width="512px" + height="512px" + borderlayer="true" + inkscape:showpageshadow="false" + showgrid="false" + inkscape:window-width="1440" + inkscape:window-height="828" + inkscape:window-x="0" + inkscape:window-y="26" /> + <metadata + id="metadata3169"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <rect + style="color:black;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="rect5138" + width="513" + height="511" + x="-1" + y="1" + rx="0" + ry="0" /> + <rect + style="color:black;fill:url(#linearGradient5218);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:2.99999976;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="rect5140" + width="66.999771" + height="24.000029" + x="423.46078" + y="474.49997" + rx="2.9687498" + ry="2.96875" /> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans" + x="443.63379" + y="490.00003" + id="text5142"><tspan + sodipodi:role="line" + id="tspan5144" + x="443.63379" + y="490.00003">Next</tspan></text> + <rect + ry="2.96875" + rx="2.9687474" + y="471.15356" + x="188.79411" + height="24.000029" + width="50.999733" + id="rect5180" + style="color:black;fill:url(#linearGradient5212);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.99999958;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + <text + id="text5182" + y="485.98041" + x="200.80385" + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans" + xml:space="preserve"><tspan + y="485.98041" + x="200.80385" + id="tspan5184" + sodipodi:role="line">Help</tspan></text> + <rect + style="fill:white;stroke:#babdb6;stroke-width:1.14902854;stroke-miterlimit:4;stroke-dasharray:none" + id="rect4293" + width="302.04697" + height="325.17773" + x="191.37843" + y="123.24775" + rx="3.1898239" + ry="3.6478913" /> + <path + style="fill:#87bd87;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 7.1111107,520.72932 C 7.1111107,520.72932 135.78292,525.54946 135.58744,471.36984 C 135.392,417.1999 135.97832,457.14761 135.97832,457.14761 L 136.85488,126.69001 C 136.85488,126.69001 135.59675,103.14234 145.82517,90.297902 C 157.15075,76.075702 173.17392,75.657432 173.17392,75.657432 C 173.17392,75.657432 365.17061,79.723792 464.44254,78.167232 C 518.57963,77.330632 519.94771,8.7293224 519.94771,8.7293224 L 7.1111107,7.8927224 L 7.1111107,520.72932 z " + id="path4669" + sodipodi:nodetypes="czccscsccc" /> + <path + style="fill:#87d958;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M -0.41829972,512.83464 C -0.41829972,512.83464 128.25351,517.65478 128.05803,463.47516 C 127.86259,409.30522 128.44891,449.25293 128.44891,449.25293 L 129.32547,118.79533 C 129.32547,118.79533 128.06734,95.247664 138.29576,82.403217 C 149.62134,68.181022 165.64451,67.76275 165.64451,67.76275 C 165.64451,67.76275 357.6412,71.829111 456.91313,70.272551 C 511.05022,69.435951 512.4183,0.83464057 512.4183,0.83464057 L -0.41829972,-0.0019620281 L -0.41829972,512.83464 z " + id="path3730" + sodipodi:nodetypes="czccscsccc" /> + <text + xml:space="preserve" + style="font-size:24px;font-style:normal;font-weight:bold;fill:white;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="117.96078" + y="40.156864" + id="text3732"><tspan + sodipodi:role="line" + id="tspan3734" + x="117.96078" + y="40.156864">Hardware Setup</tspan></text> + <text + xml:space="preserve" + style="font-size:10px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="34.300655" + y="116.28758" + id="text3736"><tspan + sodipodi:role="line" + id="tspan3738" + x="34.300655" + y="116.28758">Welcome</tspan><tspan + sodipodi:role="line" + x="34.300655" + y="128.78758" + id="tspan3740"></tspan><tspan + sodipodi:role="line" + x="34.300655" + y="141.28758" + id="tspan3744">Choose language</tspan><tspan + sodipodi:role="line" + x="34.300655" + y="153.78758" + id="tspan3742" /><tspan + sodipodi:role="line" + x="34.300655" + y="166.28758" + id="tspan3746">Format disk</tspan><tspan + sodipodi:role="line" + x="34.300655" + y="178.78758" + id="tspan3748" /><tspan + sodipodi:role="line" + x="34.300655" + y="191.28758" + id="tspan3750">Install packages</tspan><tspan + sodipodi:role="line" + x="34.300655" + y="203.78758" + id="tspan3752" /><tspan + sodipodi:role="line" + x="34.300655" + y="216.28758" + id="tspan3754">Add users</tspan><tspan + sodipodi:role="line" + x="34.300655" + y="228.78758" + id="tspan3756" /><tspan + sodipodi:role="line" + x="34.300655" + y="241.28758" + id="tspan3758" /><tspan + sodipodi:role="line" + x="34.300655" + y="253.78758" + id="tspan3760" /><tspan + sodipodi:role="line" + x="34.300655" + y="266.28758" + id="tspan3762">Check updates</tspan><tspan + sodipodi:role="line" + x="34.300655" + y="278.78758" + id="tspan3764" /><tspan + sodipodi:role="line" + x="34.300655" + y="291.28758" + id="tspan3766">Done</tspan></text> + <text + xml:space="preserve" + style="font-size:10px;font-style:normal;font-weight:bold;fill:white;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="30.117647" + y="238.43135" + id="text3768"><tspan + sodipodi:role="line" + id="tspan3770" + x="30.117647" + y="238.43135">Hardware setup</tspan></text> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="197.43791" + y="105.41177" + id="text3776"><tspan + sodipodi:role="line" + id="tspan3778" + x="197.43791" + y="105.41177">Choose driver:</tspan></text> + <path + style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.73778713px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 12.231207,229.93425 L 26.90235,234.95978 L 11.581307,241.07227 L 12.231207,229.93425 z " + id="path3782" + sodipodi:nodetypes="cccc" /> + </g> +</svg> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0