December 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r54304 - in /trunk/gtk: ChangeLog src/YGDialog.h src/YGDumbTab.cc src/YGFrame.cc src/YGInputField.cc src/YGLayout.cc src/YGRadioButton.cc src/YGWidget.h src/YGWizard.cc src/ygtkfieldentry.c
by rpmcruz＠svn.opensuse.org 20 Dec '08

20 Dec '08

Author: rpmcruz Date: Sat Dec 20 02:46:20 2008 New Revision: 54304 URL: http://svn.opensuse.org/viewcvs/yast?rev=54304&view=rev Log: * src/YGWidget.h, src/YGLayoutBox.cc, src/YGDialog.h, src/YGFrame.cc, src/YGDumbTab.cc, src/YGRadioButton.cc, src/YGWizard.cc: bug fix 460728: make sure to call parent class for add and removeChild methods. Affects YAlignment. * src/ygtkfieldentry.c: select entry besides focusing it. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.h trunk/gtk/src/YGDumbTab.cc trunk/gtk/src/YGFrame.cc trunk/gtk/src/YGInputField.cc trunk/gtk/src/YGLayout.cc trunk/gtk/src/YGRadioButton.cc trunk/gtk/src/YGWidget.h trunk/gtk/src/YGWizard.cc trunk/gtk/src/ygtkfieldentry.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=54304&r1=54303… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Dec 20 02:46:20 2008 @@ -1,3 +1,12 @@ +2008-12-20 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGWidget.h, src/YGLayoutBox.cc, src/YGDialog.h, src/YGFrame.cc, + src/YGDumbTab.cc, src/YGRadioButton.cc, src/YGWizard.cc: + bug fix 460728: make sure to call parent class for add and removeChild + methods. Affects YAlignment. + + * src/ygtkfieldentry.c: select entry besides focusing it. + 2008-12-18 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGSelectionModel.h/cc: bug fix 459313: we are using GTK model Modified: trunk/gtk/src/YGDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.h?rev=54304&r1=… ============================================================================== --- trunk/gtk/src/YGDialog.h (original) +++ trunk/gtk/src/YGDialog.h Sat Dec 20 02:46:20 2008 @@ -44,8 +44,8 @@ void setTitle (const std::string &title, bool sticky = false); void setIcon (const std::string &icon); - YGWIDGET_IMPL_CHILD_ADDED (m_containee) - YGWIDGET_IMPL_CHILD_REMOVED (m_containee) + YGWIDGET_IMPL_CHILD_ADDED (YDialog, m_containee) + YGWIDGET_IMPL_CHILD_REMOVED (YDialog, m_containee) }; #endif // YGDIALOG_H Modified: trunk/gtk/src/YGDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDumbTab.cc?rev=54304&r… ============================================================================== --- trunk/gtk/src/YGDumbTab.cc (original) +++ trunk/gtk/src/YGDumbTab.cc Sat Dec 20 02:46:20 2008 @@ -153,8 +153,8 @@ } YGWIDGET_IMPL_COMMON - YGWIDGET_IMPL_CHILD_ADDED (m_containee) - YGWIDGET_IMPL_CHILD_REMOVED (m_containee) + YGWIDGET_IMPL_CHILD_ADDED (YDumbTab, m_containee) + YGWIDGET_IMPL_CHILD_REMOVED (YDumbTab, m_containee) }; YDumbTab *YGOptionalWidgetFactory::createDumbTab (YWidget *parent) Modified: trunk/gtk/src/YGFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGFrame.cc?rev=54304&r1=… ============================================================================== --- trunk/gtk/src/YGFrame.cc (original) +++ trunk/gtk/src/YGFrame.cc Sat Dec 20 02:46:20 2008 @@ -101,8 +101,8 @@ { return label(); } YGWIDGET_IMPL_COMMON - YGWIDGET_IMPL_CHILD_ADDED (m_containee) - YGWIDGET_IMPL_CHILD_REMOVED (m_containee) + YGWIDGET_IMPL_CHILD_ADDED (YFrame, m_containee) + YGWIDGET_IMPL_CHILD_REMOVED (YFrame, m_containee) }; @@ -173,8 +173,8 @@ } YGWIDGET_IMPL_COMMON - YGWIDGET_IMPL_CHILD_ADDED (m_containee) - YGWIDGET_IMPL_CHILD_REMOVED (m_containee) + YGWIDGET_IMPL_CHILD_ADDED (YCheckBoxFrame, m_containee) + YGWIDGET_IMPL_CHILD_REMOVED (YCheckBoxFrame, m_containee) private: static void toggled_cb (GtkWidget *widget, YGCheckBoxFrame *pThis) Modified: trunk/gtk/src/YGInputField.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGInputField.cc?rev=5430… ============================================================================== --- trunk/gtk/src/YGInputField.cc (original) +++ trunk/gtk/src/YGInputField.cc Sat Dec 20 02:46:20 2008 @@ -8,7 +8,7 @@ #include "YGUtils.h" #include "ygtkfieldentry.h" -#include "YInputField.h" +#include <YInputField.h> class YGInputField : public YInputField, public YGLabeledWidget { Modified: trunk/gtk/src/YGLayout.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGLayout.cc?rev=54304&r1… ============================================================================== --- trunk/gtk/src/YGLayout.cc (original) +++ trunk/gtk/src/YGLayout.cc Sat Dec 20 02:46:20 2008 @@ -83,12 +83,12 @@ virtual void addChild (YWidget *ychild) { - YWidget::addChild (ychild); + YLayoutBox::addChild (ychild); doAddChild (ychild, getWidget()); if (primary() == YD_HORIZ) group.addWidget (ychild); } - YGWIDGET_IMPL_CHILD_REMOVED (getWidget()) + YGWIDGET_IMPL_CHILD_REMOVED (YLayoutBox, getWidget()) YGLAYOUT_PREFERRED_SIZE_IMPL (YLayoutBox) YGLAYOUT_SET_SIZE_IMPL (YLayoutBox) }; @@ -119,11 +119,11 @@ virtual void addChild (YWidget *ychild) { - YWidget::addChild (ychild); + YButtonBox::addChild (ychild); doAddChild (ychild, getWidget()); group.addWidget (ychild); } - YGWIDGET_IMPL_CHILD_REMOVED (getWidget()) + YGWIDGET_IMPL_CHILD_REMOVED (YButtonBox, getWidget()) YGLAYOUT_PREFERRED_SIZE_IMPL (YButtonBox) YGLAYOUT_SET_SIZE_IMPL (YButtonBox) }; @@ -158,8 +158,8 @@ g_object_unref (G_OBJECT (m_background_pixbuf)); } - YGWIDGET_IMPL_CHILD_ADDED (m_widget) - YGWIDGET_IMPL_CHILD_REMOVED (m_widget) + YGWIDGET_IMPL_CHILD_ADDED (YAlignment, m_widget) + YGWIDGET_IMPL_CHILD_REMOVED (YAlignment, m_widget) YGLAYOUT_PREFERRED_SIZE_IMPL (YAlignment) YGLAYOUT_SET_SIZE_IMPL (YAlignment) @@ -278,8 +278,8 @@ } YGWIDGET_IMPL_COMMON - YGWIDGET_IMPL_CHILD_ADDED (getWidget()) - YGWIDGET_IMPL_CHILD_REMOVED (getWidget()) + YGWIDGET_IMPL_CHILD_ADDED (YReplacePoint, getWidget()) + YGWIDGET_IMPL_CHILD_REMOVED (YReplacePoint, getWidget()) }; YReplacePoint *YGWidgetFactory::createReplacePoint (YWidget *parent) @@ -303,8 +303,8 @@ } YGWIDGET_IMPL_COMMON - YGWIDGET_IMPL_CHILD_ADDED (getWidget()) - YGWIDGET_IMPL_CHILD_REMOVED (getWidget()) + YGWIDGET_IMPL_CHILD_ADDED (YSquash, getWidget()) + YGWIDGET_IMPL_CHILD_REMOVED (YSquash, getWidget()) }; YSquash *YGWidgetFactory::createSquash (YWidget *parent, bool hsquash, bool vsquash) Modified: trunk/gtk/src/YGRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGRadioButton.cc?rev=543… ============================================================================== --- trunk/gtk/src/YGRadioButton.cc (original) +++ trunk/gtk/src/YGRadioButton.cc Sat Dec 20 02:46:20 2008 @@ -128,8 +128,8 @@ } YGWIDGET_IMPL_COMMON - YGWIDGET_IMPL_CHILD_ADDED (m_widget) - YGWIDGET_IMPL_CHILD_REMOVED (m_widget) + YGWIDGET_IMPL_CHILD_ADDED (YRadioButtonGroup, m_widget) + YGWIDGET_IMPL_CHILD_REMOVED (YRadioButtonGroup, m_widget) }; YRadioButtonGroup *YGWidgetFactory::createRadioButtonGroup (YWidget *parent) Modified: trunk/gtk/src/YGWidget.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWidget.h?rev=54304&r1=… ============================================================================== --- trunk/gtk/src/YGWidget.h (original) +++ trunk/gtk/src/YGWidget.h Sat Dec 20 02:46:20 2008 @@ -116,14 +116,14 @@ } // for containers -#define YGWIDGET_IMPL_CHILD_ADDED(container) \ +#define YGWIDGET_IMPL_CHILD_ADDED(ParentClass, container) \ virtual void addChild (YWidget *ychild) { \ - YWidget::addChild (ychild); \ + ParentClass::addChild (ychild); \ doAddChild (ychild, container); \ } -#define YGWIDGET_IMPL_CHILD_REMOVED(container) \ +#define YGWIDGET_IMPL_CHILD_REMOVED(ParentClass, container) \ virtual void removeChild (YWidget *ychild) { \ - YWidget::removeChild (ychild); \ + ParentClass::removeChild (ychild); \ doRemoveChild (ychild, container); \ } Modified: trunk/gtk/src/YGWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWizard.cc?rev=54304&r1… ============================================================================== --- trunk/gtk/src/YGWizard.cc (original) +++ trunk/gtk/src/YGWizard.cc Sat Dec 20 02:46:20 2008 @@ -293,8 +293,8 @@ } YGWIDGET_IMPL_COMMON - YGWIDGET_IMPL_CHILD_ADDED (getWidget()) - YGWIDGET_IMPL_CHILD_REMOVED (getWidget()) + YGWIDGET_IMPL_CHILD_ADDED (YWizard, getWidget()) + YGWIDGET_IMPL_CHILD_REMOVED (YWizard, getWidget()) }; YWizard *YGOptionalWidgetFactory::createWizard (YWidget *parent, Modified: trunk/gtk/src/ygtkfieldentry.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkfieldentry.c?rev=543… ============================================================================== --- trunk/gtk/src/ygtkfieldentry.c (original) +++ trunk/gtk/src/ygtkfieldentry.c Sat Dec 20 02:46:20 2008 @@ -192,7 +192,9 @@ GList *children = gtk_container_get_children (GTK_CONTAINER (fields)); g_return_val_if_fail (children != NULL, FALSE); GtkWidget *widget = GTK_WIDGET (children->data); + g_list_free (children); + gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1); gtk_widget_grab_focus (widget); return gtk_widget_is_focus (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] r54303 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-dialogs.ycp storage/src/include/ep-hd-dialogs.ycp storage/src/include/ep-lvm-dialogs.ycp
by aschnell＠svn.opensuse.org 19 Dec '08

19 Dec '08

Author: aschnell Date: Fri Dec 19 19:09:51 2008 New Revision: 54303 URL: http://svn.opensuse.org/viewcvs/yast?rev=54303&view=rev Log: - redesigned resize dialog (bnc #456816 and #456816) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Dec 19 19:09:51 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Dec 19 18:48:45 CET 2008 - aschnell(a)suse.de + +- redesigned resize dialog (bnc #456816 and #456816) + +------------------------------------------------------------------- Tue Dec 16 17:12:18 CET 2008 - aschnell(a)suse.de - escape HTML tags (bnc #450496) Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Fri Dec 19 19:09:51 2008 @@ -543,6 +543,22 @@ boolean DlgResize(map <string, any> &data, map <string, any> disk) { + /* + * This resize dialog is simple but avoids several problems faced + * before: + * + * - Stripped digits in a bargraph (bnc #445590) + * + * - Impossible to resize to maximal size (bnc #373744, #442318, + * #456816) + * + * - Changing dialog size (bnc #460382) + * + * If somebody wants fancy stuff like slider or bargraph it's a + * feature request. + */ + + map<string, map> target_map = Storage::GetTargetMap(); @@ -563,7 +579,6 @@ string device = data["device"]:"error"; symbol used_fs = data["used_fs"]:`none; - boolean onLvm = ( data["type"]:`unknown == `lvm); integer used_k = FileSystems::MinFsSizeK(used_fs); @@ -585,69 +600,14 @@ } integer min_free_k = 10*1024; - integer size_k = data["size_k"]:0; // minimal and maximal size for volume integer min_size_k = Integer::Min([ used_k + min_free_k, size_k ]); integer max_size_k = 0; - - string unit = _("MB"); - integer factor = 1024; - - //Depending on size of the partition, - //set correct division factor and units - //and minimum required free space, too - // TODO: get rid of this unit factor and unit altogether - void AdjustUnits() - { - if (max_size_k > 20*1024*1024) - { - factor = factor * 1024; - unit = _("GB"); - } - } - - string heading = ""; - - list <string> BarGraphLabels( boolean newlines ) - { - string used = ""; - string free = ""; - string available = ""; - - switch (data["type"]:`unknown) - { - case `primary: - case `logical: - // Labels for bar graph/text field. Keep it short - used = newlines ? _("Used\nSpace") : _("Used Space: "); - if (used_fs == `swap) - // Labels for bar graph/text field. Keep it short - free = newlines? _("Swap\nSpace") : _("Swap Space: "); - else - // Labels for bar graph/text field. Keep it short - free = newlines ? _("Free\nSpace") : _("Free Space: "); - // Labels for bar graph. Keep it short - available = newlines ? _("Unused\nDisk") : _("Unused Disk: "); - break; - - case `lvm: - // Labels for bar graph/text field. LV stands for 'Logical volume'. Keep it short - used = newlines ? _("LV\nUsed") : _("LV Used: "); - // Labels for bar graph/text field. LV stands for 'Logical volume'. Keep it short - free = newlines ? _("LV\nFree") : _("LV Free: "); - // Labels for bar graph/text field. VG stands for 'Volume group'. Keep it short - available = newlines ? _("VG\nFree") : _("VG Free: "); - break; - } - - return [ used, free, available ]; - } - switch (data["type"]:`unknown) { case `primary: @@ -675,85 +635,46 @@ break; } + // size_k + min_size_k could be > max_size_k + min_size_k = Integer::Min([ min_size_k, max_size_k ]); + y2milestone("used_k:%1 size_k:%2", used_k, size_k); y2milestone("min_size_k:%1 max_size_k:%2", min_size_k, max_size_k); - AdjustUnits(); - - integer slider_size_k = size_k / factor; - integer slider_min_size_k = min_size_k / factor; - integer slider_max_size_k = max_size_k / factor; - - term extra_content = `Empty(); - //Spinbox label - %1 will be substituted by unit (GB and alike) - string newsz = onLvm ? _("New Logical Volume Size (in %1)") : _("New Partition Size (in %1)"); - - if (UI::HasSpecialWidget(`BarGraph) && UI::HasSpecialWidget(`Slider)) - { - extra_content = `VBox( - `BarGraph(`id(`graph), `opt(`vstretch), [ slider_min_size_k, slider_size_k - slider_min_size_k, - slider_max_size_k - slider_size_k ], BarGraphLabels( true ) ), - `VSpacing(0.5), - `Slider(`id(`new_size), `opt(`notify), sformat( newsz, unit), - slider_min_size_k, slider_max_size_k, slider_size_k) - ); - } - else - { - extra_content = `IntField( `id(`new_size), `opt(`notify), sformat(newsz, unit ), - slider_min_size_k, slider_max_size_k, slider_size_k ); - } - - //without newlines - list <string> other_labels = BarGraphLabels( false ); + term infos = `VBox(`Left(`Label(sformat(_("Current size: %1"), Storage::KByteToHumanString(size_k))))); + if (used_fs != `swap && !data["format"]:false) + infos = add(infos, `Left(`Label(sformat(_("Currently used: %1"), Storage::KByteToHumanString(used_k))))); + + + term contents = `HVSquash( + // frame heading + `FrameWithMarginBox(_("Size"), + `RadioButtonGroup(`id(`size), + `VBox( + `LeftRadioButton(`id(`max_size), `opt(`notify), + // radio button text, %1 is replaced by size + sformat(_("Maximum Size (%1)"), Storage::KByteToHumanString(max_size_k))), + `LeftRadioButton(`id(`min_size), `opt(`notify), + // radio button text, %1 is replaced by size + sformat(_("Minimum Size (%1)"), Storage::KByteToHumanString(min_size_k))), + // radio button text + `LeftRadioButtonWithAttachment(`id(`custom_size), `opt(`notify), _("Custom Size"), + `VBox(`id(`custom_size_attachment), + `MinWidth(15, `InputField(`id(`custom_size_input), + `opt(`shrinkable), _("Size"))) + )), + `VSpacing(1), + infos + ) + ) + )); UI::OpenDialog( `VBox( `Left(`Heading(heading)), - `HSpacing(60), - `VBox( - //Frame label - `Frame( onLvm ? _("Space on Logical Volume ") : _("Space on the Partition"), - `MarginBox( 0.5, 0.5, - `Left(`HBox( - ( used_fs != `swap) ? ( - `HBox( - `Label( other_labels[0]:""), - `Label(`id(`used), `opt(`outputField), Storage::KByteToHumanString( min_size_k)), - `HSpacing(0.5)) - ) : `Empty(), - - `Label( other_labels[1]:""), - `ReplacePoint(`id(`r2), - `Label(`id(`free),`opt(`outputField), Storage::KByteToHumanString(size_k - min_size_k)) - ), - `HSpacing(0.5), - - `Label( other_labels[2]:""), - `ReplacePoint(`id(`r3), - `Label(`id(`unused),`opt(`outputField), Storage::KByteToHumanString( max_size_k - size_k)) - ) - )) - ) - ) - ), - extra_content, + Greasemonkey::Transform(contents), `VSpacing(1.0), - //Frame label - `Frame ( onLvm ? _("LV Size Restrictions") : _("Partition Size Restrictions"), - `MarginBox(0.5, 0.5, - `Left(`HBox( - //text field label - `Label( onLvm ? _("Minimum LV Size") : _("Minimum Partition Size: ")), - `Label(`opt(`outputField), Storage::KByteToHumanString(min_size_k)), - `HSpacing(0.5), - //text field label - `Label( onLvm ? _("Maximum LV Size") : _("Maximum Partition Size: ")), - `Label(`opt(`outputField), Storage::KByteToHumanString(max_size_k)) - )) - ) - ), `ButtonBox( `PushButton(`id(`help), `opt(`helpButton), Label::HelpButton()), `PushButton(`id(`cancel), `opt(`cancelButton), Label::CancelButton()), @@ -763,11 +684,12 @@ ); // help text - string help_text = _("<p>Choose the new size by dragging the slider or by entering a -numeric value in either input field.</p>"); + string help_text = _("<p>Choose new size.</p>"); UI::ChangeWidget(`help, `HelpText, help_text); + UI::ChangeWidget(`id(`size), `Value, `max_size); + UI::ChangeWidget(`id(`custom_size_attachment), `Enabled, false); symbol widget = nil; @@ -779,26 +701,65 @@ switch (widget) { - case `new_size: + case `max_size: { - slider_size_k = (integer) UI::QueryWidget(`id(`new_size), `Value); - size_k = Integer::Clamp(slider_size_k * factor, min_size_k, max_size_k); - - UI::ChangeWidget(`id(`graph), `Values, [ slider_min_size_k, slider_size_k - slider_min_size_k, - slider_max_size_k - slider_size_k ]); - + UI::ChangeWidget(`id(`custom_size_attachment), `Enabled, false); + break; + } - //Replacing widgets, rather than just changing value. It is clumsy, but UI sets value - //of the label without adjusting its size. RecalcLayout makes ncurses flicker insanely. - //ReplaceWidget does, too, but not so much - UI::ReplaceWidget(`id(`r2), `Label(`opt(`outputField), Storage::KByteToHumanString( size_k - min_size_k )) ); - UI::ReplaceWidget(`id(`r3), `Label(`opt(`outputField), Storage::KByteToHumanString( max_size_k - size_k )) ); + case `min_size: + { + UI::ChangeWidget(`id(`custom_size_attachment), `Enabled, false); + break; + } + case `custom_size: + { + UI::ChangeWidget(`id(`custom_size_attachment), `Enabled, true); break; } case `ok: { + switch ((symbol) UI::QueryWidget(`id(`size), `Value)) + { + case `max_size: + { + size_k = max_size_k; + break; + } + + case `min_size: + { + size_k = min_size_k; + break; + } + + case `custom_size: + { + string tmp = (string) UI::QueryWidget(`id(`custom_size_input), `Value); + if (!Storage::HumanStringToKByte(tmp, size_k)) + { + // error popup, %1 and %2 are replaced by sizes + Popup::Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."), + Storage::KByteToHumanString(500*1024), + Storage::KByteToHumanString(1024*1024))); + widget = `again; + continue; + } + else if (size_k < min_size_k || size_k > max_size_k) + { + // error popup, %1 and %2 are replaced by sizes + Popup::Error(sformat(_("The size entered is invalid. Enter a size between %1 and %2."), + Storage::KByteToHumanString(min_size_k), + Storage::KByteToHumanString(max_size_k))); + widget = `again; + continue; + } + break; + } + } + if (size_k != old_size_k) { string mountpoint = data["inactive"]:false ? "" : data["mount"]:""; Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Fri Dec 19 19:09:51 2008 @@ -118,8 +118,8 @@ // radio button text `LeftRadioButtonWithAttachment(`id(`manual_size), `opt(`notify), _("Custom Size"), `VBox(`id(`manual_size_attachment), - `MinWidth(15, `InputField(`id(`size_input), `opt(`shrinkable), - _("Size (e.g. 9.0 MB or 9.0 GB)"))) + `MinWidth(15, `InputField(`id(`size_input), + `opt(`shrinkable), _("Size"))) )), // radio button text `LeftRadioButtonWithAttachment(`id(`manual_region), `opt(`notify), _("Custom Region"), Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Fri Dec 19 19:09:51 2008 @@ -375,9 +375,10 @@ `VBox( `LeftRadioButton(`id(`max_size), `opt(`notify), sformat(_("Maximum Size (%1)"), Storage::KByteToHumanString(max_size_k))), - `LeftRadioButtonWithAttachment(`id(`manual_size), `opt(`notify), _("Manual Size"), + `LeftRadioButtonWithAttachment(`id(`manual_size), `opt(`notify), _("Custom Size"), `VBox(`id(`manual_size_attachment), - `MinWidth(15, `InputField(`id(`size_input), `opt(`shrinkable), _("Size"))) + `MinWidth(15, `InputField(`id(`size_input), + `opt(`shrinkable), _("Size"))) ) ) ) -- 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] r54302 - in /branches/tmp/tgoettlicher/yast2cc_rewrite/src: CMakeLists.txt yccmoduleinfoprovider.cpp yccmoduleinfoprovider.h yqmodulesmodel.cpp
by dmacvicar＠svn.opensuse.org 19 Dec '08

19 Dec '08

Author: dmacvicar Date: Fri Dec 19 16:17:32 2008 New Revision: 54302 URL: http://svn.opensuse.org/viewcvs/yast?rev=54302&view=rev Log: Implements Stano's idea of status in the modules, using the easier yast2 external call while core get's stano's patch Added: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yccmoduleinfoprovider.cpp branches/tmp/tgoettlicher/yast2cc_rewrite/src/yccmoduleinfoprovider.h Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulesmodel.cpp Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt Fri Dec 19 16:17:32 2008 @@ -22,6 +22,8 @@ # moduleiconitem.cpp # kcmoduleinfo.cpp + yccmoduleinfoprovider.cpp + yqdesktopfilesmodel.cpp yqmodulegroupsmodel.cpp yqmodulesmodel.cpp @@ -42,7 +44,9 @@ # moduleiconitem.h # kcmoduleinfo.h kcategorizedview_p.h - + + yccmoduleinfoprovider.h + yqdesktopfilesmodel.h yqmodulegroupsmodel.h yqmodulesmodel.h @@ -69,6 +73,7 @@ models_test.cpp yqdesktopfilesmodel.cpp yqmodulegroupsmodel.cpp + yccmoduleinfoprovider.cpp yqmodulesmodel.cpp ) Added: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yccmoduleinfoprovider.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/yccmoduleinfoprovider.cpp (added) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/yccmoduleinfoprovider.cpp Fri Dec 19 16:17:32 2008 @@ -0,0 +1,84 @@ + +#include <QTemporaryFile> +#include <QProcess> +#include <QDebug> + +#include "yccmoduleinfoprovider.h" + +YCCModuleInfoProvider::YCCModuleInfoProvider() +{ +} + +YCCModuleInfoProvider::~YCCModuleInfoProvider() +{ +} + +//if defined $X-SuSE-YaST-AutoInst && $X-SuSE-YaST-AutoInst != none +// X-SuSE-YaST-AutoInst=all +QString YCCModuleInfoProvider::provideInfo( const YQModulesModel *model, const QModelIndex &module ) const +{ +///sbin/yast2 get_status foo_auto /tmp/status + QString ret; + + QString autoinst = model->propertyValue( module, "X-SuSE-YaST-AutoInst" ).toString(); + if ( ! autoinst.isEmpty() && ( autoinst != "none" ) ) + { + //QTemporaryFile file; + + //if ( ! file.open() ) + //{ + // qDebug() << "Can't create temporary file"; + // return QString(); + //} + + QStringList arguments; + QString modcall = model->propertyValue( module, "X-SuSE-YaST-Call" ).toString(); + if ( ! modcall.isEmpty() ) + { + QProcess yast2; + QString autoinstclient = model->propertyValue( module, "X-SuSE-YaST-AutoInstClient" ).toString(); + if ( autoinstclient.isEmpty() ) + { + autoinstclient = modcall + "_auto"; + } + + QStringList args; + //args << (autoinstclient) << file.fileName(); + args << "get_status" << (autoinstclient) << "/tmp/ycc_status"; + qDebug() << "Executing yast2 " << args; + + yast2.start("/sbin/yast2", args ); + + if ( ! yast2.waitForFinished() ) + { + qDebug() << "bad yast2 exit"; + return QString(); + } + + //QFile data(file.fileName()); + QFile data("/tmp/ycc_status"); + if ( data.open( QIODevice::ReadOnly ) ) + { + QTextStream in(&data); + while (!in.atEnd()) + { + QString line = in.readLine(); + ret += line; + } + } + else + qDebug() << "can't read from temporary file" << ret; + } + else + { + qDebug() << "no info to call"; + } + + } + else + { + qDebug() << "no info to call"; + } + return ret; +} + Added: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yccmoduleinfoprovider.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/yccmoduleinfoprovider.h (added) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/yccmoduleinfoprovider.h Fri Dec 19 16:17:32 2008 @@ -0,0 +1,18 @@ + +#ifndef YCCModuleInfoProvider_H +#define YCCModuleInfoProvider_H + +#include "yqmodulesmodel.h" + +class YCCModuleInfoProvider +{ +public: + YCCModuleInfoProvider(); + ~YCCModuleInfoProvider(); + + QString provideInfo( const YQModulesModel *model, const QModelIndex &module ) const; + +private: +}; + +#endif Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulesmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulesmodel.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulesmodel.cpp Fri Dec 19 16:17:32 2008 @@ -15,6 +15,7 @@ #include "yqmodulesproxymodel.h" #include "yqmodulegroupsmodel.h" +#include "yccmoduleinfoprovider.h" class YQModulesModel::Private { @@ -33,6 +34,7 @@ YQModuleGroupsModel *groupsModel; QMap<int, QString> groupidCache; QMap<QModelIndex, QModelIndex> groupCache; + YCCModuleInfoProvider infoProvider; }; @@ -103,6 +105,12 @@ { return groupsModel()->data( groupForModule(index) ); } + else if ( role == Qt::ToolTipRole ) + { + QString tooltip = d->infoProvider.provideInfo( this, index ); + qDebug() << "tooptip requested: " << tooltip; + return tooltip; + } else // otherwise just use the parent class { return YQDesktopFilesModel::data(index, role); -- 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] r54301 - /trunk/storage/storage/src/include/custom_part_check_generated.ycp
by aschnell＠svn.opensuse.org 19 Dec '08

19 Dec '08

Author: aschnell Date: Fri Dec 19 15:53:38 2008 New Revision: 54301 URL: http://svn.opensuse.org/viewcvs/yast?rev=54301&view=rev Log: - use Region::End() Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Fri Dec 19 15:53:38 2008 @@ -29,6 +29,7 @@ import "AutoinstData"; import "FileSystems"; import "Stage"; + import "Region"; include "partitioning/custom_part_helptexts.ycp"; @@ -100,7 +101,7 @@ } root_found = true; dmraid_root = diskinfo["type"]:`CT_UNKNOWN == `CT_DMRAID; - root_end = part["region",0]:0 + part["region",1]:1-1; + root_end = Region::End(part["region"]:[]); if( !contains( [ `primary, `logical ], part["type"]:`unknown )) { // root_end does not have anything to do with physical cylinders @@ -125,7 +126,7 @@ boot_found = true; if( diskinfo["type"]:`CT_UNKNOWN==`CT_DISK ) { - boot_end = part["region",0]:0 + part["region",1]:1-1; + boot_end = Region::End(part["region"]:[]); } else { @@ -143,14 +144,14 @@ (fsid == Partitions::fsid_prep_chrp_boot || fsid==6) ) { boot_found = true; - boot_end = part["region",0]:0 + part["region",1]:1-1; + boot_end = Region::End(part["region"]:[]); boot_fs = part["used_fs"]:`unknown; boot_size_k = part["size_k"]:0; } else if( Arch::board_mac() && part["used_fs"]:`unknown==`hfs ) { boot_found = true; - boot_end = part["region",0]:0 + part["region",1]:1-1; + boot_end = Region::End(part["region"]:[]); boot_fs = part["used_fs"]:`unknown; boot_size_k = part["size_k"]:0; } -- 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] r54300 - /trunk/storage/storage/src/include/custom_part_check_generated.ycp
by aschnell＠svn.opensuse.org 19 Dec '08

19 Dec '08

Author: aschnell Date: Fri Dec 19 15:42:15 2008 New Revision: 54300 URL: http://svn.opensuse.org/viewcvs/yast?rev=54300&view=rev Log: - removed Sparc checks Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Fri Dec 19 15:42:15 2008 @@ -56,8 +56,6 @@ boolean partition_mounted_but_not_formated = false; boolean have_swap = false; symbol retval = `next; - boolean sparc_first_is_swap = false; - string sparc_first_dev = ""; boolean swap_found = false; boolean boot_found = false; boolean root_found = false; @@ -72,8 +70,6 @@ symbol boot_fs = `unknown; integer boot_size_k = 0; boolean boot_size_check = !(Arch::board_chrp() || Arch::board_prep() || Arch::board_iseries() || Arch::board_mac()); - integer root_cyl_for_gb = 0; - integer boot_cyl_for_gb = 0; boolean fat_system_mount = false; boolean fat_system_boot = false; boolean dmraid_root = false; @@ -111,7 +107,6 @@ root_end = 0; } root_fs = part["used_fs"]:`unknown; - root_cyl_for_gb = 1073741824 / diskinfo["cyl_size"]:1000000; // 1GB/cylinder size if ( part["type"]:`unknown==`sw_raid ) root_raid = true; if( !boot_raid ) raid_type = part["raid_type"]:""; @@ -131,13 +126,10 @@ if( diskinfo["type"]:`CT_UNKNOWN==`CT_DISK ) { boot_end = part["region",0]:0 + part["region",1]:1-1; - // 1GB/cylinder size - boot_cyl_for_gb = 1073741824 / diskinfo["cyl_size"]:1000000; } else { boot_end = 0; - boot_cyl_for_gb = 0; } boot_fs = part["used_fs"]:`unknown; boot_size_k = part["size_k"]:0; @@ -153,7 +145,6 @@ boot_found = true; boot_end = part["region",0]:0 + part["region",1]:1-1; boot_fs = part["used_fs"]:`unknown; - boot_cyl_for_gb = 1073741824 / diskinfo["cyl_size"]:1000000; boot_size_k = part["size_k"]:0; } else if( Arch::board_mac() && part["used_fs"]:`unknown==`hfs ) @@ -161,7 +152,6 @@ boot_found = true; boot_end = part["region",0]:0 + part["region",1]:1-1; boot_fs = part["used_fs"]:`unknown; - boot_cyl_for_gb = 1073741824 / diskinfo["cyl_size"]:1000000; boot_size_k = part["size_k"]:0; } } @@ -170,7 +160,6 @@ ////////////////////////////////////////////////////////////// // look for swap partition and check: // - is there any - // - on sparc: is first partition a swap partition // // check only "swap" not fsid cause for example on pdisk fsid = 0 // @@ -179,15 +168,6 @@ if( mountpoint == "swap" ) { have_swap = true; - - // first partition of a sparc system shouldn't be a swap - // parition - if( Arch::sparc() && part["type"]:`unknown==`primary && - part["nr"]:0 == 1 ) - { - sparc_first_is_swap = true; - sparc_first_dev = disk; - } } @@ -297,24 +277,6 @@ } - // not substring sparc! - if ( ( Arch::sparc32 () && boot_end >= boot_cyl_for_gb ) || show_all_popups ) - { - // popup text - boolean ret = Popup::YesNo(sformat(_("Warning: -With the current setup, your %1 -installation might not be directly bootable. -Some PROM versions have problems with a boot -partition with an end cylinder above 1 GB. - -Change this? -"),Product::name)); - - - if (ret == true) retval = `again; - } - - if ( (boot_size_k < 12*1024 && boot_size_check) || show_all_popups ) { // popup text @@ -372,34 +334,6 @@ if (ret == true) retval = `again; } - if ( (Arch::sparc32 () && root_end >= root_cyl_for_gb) || show_all_popups ) - { - // popup text - boolean ret = Popup::YesNo(sformat(_("Warning: With your current setup, your %1 -installation might not be directly bootable, because -some PROM versions have problems with a boot partition -ending above the 1 GB boundary. - -Change this? -"),Product::name)); - - if (ret == true) retval = `again; - } - - if ( (Arch::sparc () && root_fs != `ext2) || show_all_popups ) - { - // popup text - boolean ret = Popup::YesNo(sformat( -_("Warning: With your current setup, your %1 -installation might not be directly bootable, because -some PROM versions have problems with a boot partition -ending above the 1 GB boundary. - -Change this? -"),Product::name)); - - if (ret == true) retval = `again; - } } // iSeries has no problems with this configuration @@ -507,16 +441,6 @@ if (ret == true) retval = `again; } - if( sparc_first_is_swap || show_all_popups ) - { - // popup message - Popup::Error( sformat(_(" -Your swap partition is the first partition of %1. -It is strongly recommended to change this, because -the disk label will be deleted. -"), sparc_first_dev )); - retval = `again; - } if( (partition_mounted_but_not_formated && installation) || show_all_popups ) { -- 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] r54299 - in /trunk/sound: package/yast2-sound.changes sound/src/complex.ycp sound/src/joy_dialog.ycp
by lslezak＠svn.opensuse.org 19 Dec '08

19 Dec '08

Author: lslezak Date: Fri Dec 19 15:19:49 2008 New Revision: 54299 URL: http://svn.opensuse.org/viewcvs/yast?rev=54299&view=rev Log: - sound, joystick - hide the Back button in the overview dialog (bnc#440561, bnc#440559) Modified: trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/complex.ycp trunk/sound/sound/src/joy_dialog.ycp Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Fri Dec 19 15:19:49 2008 @@ -1,8 +1,10 @@ ------------------------------------------------------------------- -Fri Dec 19 09:43:03 CET 2008 - lslezak(a)suse.cz +Fri Dec 19 15:18:05 CET 2008 - lslezak(a)suse.cz - removed the progress dialog at start up (bnc#447573) - abort immediately when there is no change (bnc#458317) +- sound, joystick - hide the Back button in the overview dialog + (bnc#440561, bnc#440559) ------------------------------------------------------------------- Tue Dec 2 12:48:10 CET 2008 - lslezak(a)suse.cz Modified: trunk/sound/sound/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/complex.ycp?rev=… ============================================================================== --- trunk/sound/sound/src/complex.ycp (original) +++ trunk/sound/sound/src/complex.ycp Fri Dec 19 15:19:49 2008 @@ -482,6 +482,7 @@ Wizard::SetNextButton(`next, Label::OKButton()); Wizard::SetAbortButton(`abort, Label::CancelButton()); + if (!Mode::installation()) Wizard::HideBackButton(); symbol ret = `_dummy; @@ -609,6 +610,7 @@ } while (!contains([`back, `abort, `next, `add, `edit, `delete, `mixer],ret)); Wizard::RestoreNextButton(); + if (!Mode::installation()) Wizard::RestoreBackButton(); return $[ "ui": ret ]; } Modified: trunk/sound/sound/src/joy_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/joy_dialog.ycp?r… ============================================================================== --- trunk/sound/sound/src/joy_dialog.ycp (original) +++ trunk/sound/sound/src/joy_dialog.ycp Fri Dec 19 15:19:49 2008 @@ -506,6 +506,7 @@ Wizard::SetContents (caption, contents, helptext, true, true); Wizard::SetNextButton(`next, nextbutton[button]:Label::NextButton() ); + if (!Mode::installation()) Wizard::HideBackButton(); symbol s = nil; do @@ -582,6 +583,8 @@ Wizard::RestoreNextButton(); } + if (!Mode::installation()) Wizard::RestoreBackButton(); + return s; } -- 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] r54298 - in /trunk/tv: package/yast2-tv.changes src/ui.ycp
by lslezak＠svn.opensuse.org 19 Dec '08

19 Dec '08

Author: lslezak Date: Fri Dec 19 15:06:16 2008 New Revision: 54298 URL: http://svn.opensuse.org/viewcvs/yast?rev=54298&view=rev Log: - hide the Back button in the overview dialog (bnc#440562) Modified: trunk/tv/package/yast2-tv.changes trunk/tv/src/ui.ycp Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=… ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Fri Dec 19 15:06:16 2008 @@ -2,6 +2,7 @@ Fri Dec 19 14:55:25 CET 2008 - lslezak(a)suse.cz - removed the progress dialog at start up (bnc#447571) +- hide the Back button in the overview dialog (bnc#440562) ------------------------------------------------------------------- Thu Dec 18 09:38:14 CET 2008 - lslezak(a)suse.cz Modified: trunk/tv/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/ui.ycp?rev=54298&r1=54297… ============================================================================== --- trunk/tv/src/ui.ycp (original) +++ trunk/tv/src/ui.ycp Fri Dec 19 15:06:16 2008 @@ -110,6 +110,8 @@ Wizard::SetNextButton(`next, Label::OKButton()); Wizard::SetAbortButton(`abort, Label::CancelButton()); + if (!Mode::installation()) Wizard::HideBackButton(); + symbol ret = `_dummy; do { @@ -235,6 +237,7 @@ } while (!contains([`back, `abort, `next, `add_manually, `add_manually_warn, `add_detected, `edit, `edit_button_radio],ret)); Wizard::RestoreNextButton(); + if (!Mode::installation()) Wizard::RestoreBackButton(); return ret; } -- 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] r54297 - in /trunk/tv: package/yast2-tv.changes src/Tv.ycp src/ui.ycp
by lslezak＠svn.opensuse.org 19 Dec '08

19 Dec '08

Author: lslezak Date: Fri Dec 19 14:56:29 2008 New Revision: 54297 URL: http://svn.opensuse.org/viewcvs/yast?rev=54297&view=rev Log: - removed the progress dialog at start up (bnc#447571) Modified: trunk/tv/package/yast2-tv.changes trunk/tv/src/Tv.ycp trunk/tv/src/ui.ycp Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=… ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Fri Dec 19 14:56:29 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Dec 19 14:55:25 CET 2008 - lslezak(a)suse.cz + +- removed the progress dialog at start up (bnc#447571) + +------------------------------------------------------------------- Thu Dec 18 09:38:14 CET 2008 - lslezak(a)suse.cz - install additional packages automatically when Modified: trunk/tv/src/Tv.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/Tv.ycp?rev=54297&r1=54296… ============================================================================== --- trunk/tv/src/Tv.ycp (original) +++ trunk/tv/src/Tv.ycp Fri Dec 19 14:56:29 2008 @@ -3437,66 +3437,31 @@ // Title of initialization dialog string caption = _("Initializing TV and Radio Card Configuration"); - // Set the right number of stages - // 1+2: Read databases (tv, tuner) - // 3: Read the settings - // 4: Detect - integer no_of_steps = 4; - - // We do not set help text here, because it was set outside - Progress::New ( caption, " ", no_of_steps, - // Progress stage - [ _("Read the database"), - // Progress stage - _("Read the previous settings"), - // Progress stage - _("Detect the devices") ], - // Progress step - [ _("Reading the database..."), - // Progress step - _("Reading the previous settings..."), - // Progress step - _("Detecting the devices..."), - // Progress step - _("Finished") ], - "" ); - - // Read the databases - Progress::NextStage (); - if ( !ReadCardsDatabase() || eval (abort) ) + if ( !ReadCardsDatabase() ) { return false; } - Progress::NextStep (); - if ( !ReadTunersDatabase() || eval (abort) ) + if ( !ReadTunersDatabase() ) { return false; } - // Read the previous settings - Progress::NextStage (); - if ( !ReadSettings() || eval (abort) ) + if ( !ReadSettings() ) { return false; } - // Detect the devices - Progress::NextStage (); - if ( !Detect() || eval (abort) ) + if ( !Detect() ) { return false; } - ReadIRC(); // TODO add progress + ReadIRC(); tmpdir = (string) SCR::Read(.target.tmpdir); - // TODO add progress InitializeStationsConfig (); - // increase the progress to "finish" - Progress::NextStage (); - y2milestone("All cards (read & detected): %1", cards); return true; Modified: trunk/tv/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/ui.ycp?rev=54297&r1=54296… ============================================================================== --- trunk/tv/src/ui.ycp (original) +++ trunk/tv/src/ui.ycp Fri Dec 19 14:56:29 2008 @@ -16,7 +16,6 @@ import "Label"; import "Package"; import "Popup"; -import "Progress"; import "Sequencer"; import "String"; import "Summary"; -- 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] r54296 - in /trunk/sound: package/yast2-sound.changes sound/src/ui.ycp
by lslezak＠svn.opensuse.org 19 Dec '08

19 Dec '08

Author: lslezak Date: Fri Dec 19 14:38:16 2008 New Revision: 54296 URL: http://svn.opensuse.org/viewcvs/yast?rev=54296&view=rev Log: - abort immediately when there is no change (bnc#458317) Modified: trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/ui.ycp Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Fri Dec 19 14:38:16 2008 @@ -2,6 +2,7 @@ Fri Dec 19 09:43:03 CET 2008 - lslezak(a)suse.cz - removed the progress dialog at start up (bnc#447573) +- abort immediately when there is no change (bnc#458317) ------------------------------------------------------------------- Tue Dec 2 12:48:10 CET 2008 - lslezak(a)suse.cz Modified: trunk/sound/sound/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/ui.ycp?rev=54296… ============================================================================== --- trunk/sound/sound/src/ui.ycp (original) +++ trunk/sound/sound/src/ui.ycp Fri Dec 19 14:38:16 2008 @@ -30,7 +30,16 @@ * @return boolean yes/no */ define boolean ReallyAbort() ``{ - return Popup::ReallyAbort (Sound::Changed() || Joystick::Changed()); + boolean config_changed = Sound::Changed() || Joystick::Changed(); + y2milestone("Sound or joystick config changed: %1", config_changed); + + // no change, abort immediately + if (!config_changed) + { + return true; + } + + return Popup::ReallyAbort(config_changed); } /** -- 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] r54295 - in /trunk/sound: package/yast2-sound.changes sound/src/Sound.ycp
by lslezak＠svn.opensuse.org 19 Dec '08

19 Dec '08

Author: lslezak Date: Fri Dec 19 14:14:57 2008 New Revision: 54295 URL: http://svn.opensuse.org/viewcvs/yast?rev=54295&view=rev Log: - removed the progress dialog at start up (bnc#447573) Modified: trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/Sound.ycp Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Fri Dec 19 14:14:57 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Dec 19 09:43:03 CET 2008 - lslezak(a)suse.cz + +- removed the progress dialog at start up (bnc#447573) + +------------------------------------------------------------------- Tue Dec 2 12:48:10 CET 2008 - lslezak(a)suse.cz - fixed package installation in autoyast installation mode Modified: trunk/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/Sound.ycp?rev=54… ============================================================================== --- trunk/sound/sound/src/Sound.ycp (original) +++ trunk/sound/sound/src/Sound.ycp Fri Dec 19 14:14:57 2008 @@ -707,35 +707,6 @@ // sound Read dialog caption: string caption = _("Initializing Sound Configuration"); - integer steps = 5; - - Progress::New( caption, " ", steps, [ - // progress stage - _("Read card database"), - // progress stage - _("Read previously saved configuration"), - // progress stage - _("Detect sound cards"), - // progress stage - _("Read sysconfig values"), - // progress stage - _("Read volume settings"), - ], [ - // progress step label - _("Reading card database..."), - // progress step label - _("Reading previously saved configuration..."), - // progress step label - _("Detecting sound cards..."), - // progress step label - _("Reading sysconfig values..."), - // progress step label - _("Reading volume settings..."), - // progress step label - _("Finished") - ], - "" - ); if (Mode::test()) { DetectHardware(); @@ -747,44 +718,25 @@ if (interactive && PollAbort ()) return false; // load cards database - Progress::NextStage (); LoadDatabase (interactive); // load data from /etc/modules.conf - Progress::NextStage (); ReadModulesConf(); - if (interactive && PollAbort()) return false; - // detect sound cards - Progress::NextStage (); DetectHardware(); - if (interactive && PollAbort()) return false; - // check old isa cards (bug25285) if (interactive && detected_cards == [] && modules_conf == []) DetectOldCards(); - - if (interactive && PollAbort()) return false; - // read rc.config values - Progress::NextStage (); rc_vars = read_rc_vars (); - if (interactive && PollAbort()) return false; - - // load volume settings - Progress::NextStage (); volume_settings = get_vol_settings(); - if (interactive && PollAbort()) return false; - // create list of unconfigured cards UpdateUnconfiguredCards(); - // increase the progress to "finish" - Progress::NextStage (); return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0