December 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r42639 - in /trunk/gtk/unstable: ChangeLog src/YGProgressBar.cc src/YGWizard.cc src/ygtkwizard.c tests/MultiProgressMeter.ycp tests/MultiProgressMeterVer.ycp
by rpmcruz＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: rpmcruz Date: Mon Dec 3 21:13:26 2007 New Revision: 42639 URL: http://svn.opensuse.org/viewcvs/yast?rev=42639&view=rev Log: * src/ygtkwizard.c: set label title centered (visible on our Package Selector as the icon is bigger than the text). * src/YGProgressBar.cc (YGMultiProgressBar): made it flow from left to right on horizontal multi progress bars. * tests/MultiProgressBar.ycp: replaced MultiProgressBarVer.ycp by this with both orientations. Added: trunk/gtk/unstable/tests/MultiProgressMeter.ycp Removed: trunk/gtk/unstable/tests/MultiProgressMeterVer.ycp Modified: trunk/gtk/unstable/ChangeLog trunk/gtk/unstable/src/YGProgressBar.cc trunk/gtk/unstable/src/YGWizard.cc trunk/gtk/unstable/src/ygtkwizard.c Modified: trunk/gtk/unstable/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable/ChangeLog?rev=42639… ============================================================================== --- trunk/gtk/unstable/ChangeLog (original) +++ trunk/gtk/unstable/ChangeLog Mon Dec 3 21:13:26 2007 @@ -1,3 +1,13 @@ +2007-12-03 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkwizard.c: set label title centered (visible on our Package Selector + as the icon is bigger than the text). + + * src/YGProgressBar.cc (YGMultiProgressBar): made it flow from left to right + on horizontal multi progress bars. + * tests/MultiProgressBar.ycp: replaced MultiProgressBarVer.ycp by this with + both orientations. + 2007-11-30 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGUI.cc: added Refresh button for the YWidget tree dialog. Modified: trunk/gtk/unstable/src/YGProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable/src/YGProgressBar.c… ============================================================================== --- trunk/gtk/unstable/src/YGProgressBar.cc (original) +++ trunk/gtk/unstable/src/YGProgressBar.cc Mon Dec 3 21:13:26 2007 @@ -120,8 +120,7 @@ { // ygtk_ratio_box_set_homogeneous (YGTK_RATIO_BOX (getWidget()), TRUE); ygtk_ratio_box_set_spacing (YGTK_RATIO_BOX (getWidget()), 2); - - for (int i = segments()-1; i >= 0; i--) { + for (int s = 0; s < segments(); s++) { GtkWidget* bar = gtk_progress_bar_new(); gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (bar), horizontal ? GTK_PROGRESS_LEFT_TO_RIGHT : GTK_PROGRESS_BOTTOM_TO_TOP); @@ -132,7 +131,7 @@ else gtk_widget_set_size_request (bar, -1, min_size); ygtk_ratio_box_pack (YGTK_RATIO_BOX (getWidget()), bar, - maxValue (i), TRUE, TRUE, 0); + getSegmentWeight (s), TRUE, TRUE, 0); } ygtk_adj_size_set_max (YGTK_ADJ_SIZE (m_adj_size), horizontal ? 200 : 0, @@ -143,17 +142,29 @@ virtual void doUpdate() { GList* children = gtk_container_get_children (GTK_CONTAINER (getWidget())); - int n = segments()-1; - for (GList *i = children; i && n >= 0; i = i->next, n--) { + int s = 0; + for (GList *i = children; i && s < segments(); i = i->next, s++) { GtkProgressBar *bar = GTK_PROGRESS_BAR (i->data); - gfloat fraction = 0; - if (currentValue (n) != -1) - fraction = 1.0 - ((gfloat) currentValue(n) / maxValue(n)); - gtk_progress_bar_set_fraction (bar, fraction); + gtk_progress_bar_set_fraction (bar, getSegmentValue (s)); } g_list_free (children); } + int getSegmentWeight (int n) + { + if (vertical()) + n = (segments() - n) - 1; + return maxValue (n); + } + float getSegmentValue (int n) + { + if (vertical()) + n = (segments() - n) - 1; + if (currentValue (n) == -1) + return 0; + return 1.0 - (((float) currentValue (n)) / maxValue (n)); + } + YGWIDGET_IMPL_COMMON }; Modified: trunk/gtk/unstable/src/YGWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable/src/YGWizard.cc?rev… ============================================================================== --- trunk/gtk/unstable/src/YGWizard.cc (original) +++ trunk/gtk/unstable/src/YGWizard.cc Mon Dec 3 21:13:26 2007 @@ -130,7 +130,7 @@ virtual ~YGWizard() { - // m_back/abort/next_button were added as children and will be freed by ~YContainerWidget + // m_back/abort/next_button are added as children and will be freed by ~YContainerWidget } /* The purpose of this function is to do some sanity checks, besides Modified: trunk/gtk/unstable/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable/src/ygtkwizard.c?re… ============================================================================== --- trunk/gtk/unstable/src/ygtkwizard.c (original) +++ trunk/gtk/unstable/src/ygtkwizard.c Mon Dec 3 21:13:26 2007 @@ -312,7 +312,7 @@ wizard->m_title_image = gtk_image_new(); wizard->m_title_label = gtk_label_new(""); gtk_label_set_ellipsize (GTK_LABEL (wizard->m_title_label), PANGO_ELLIPSIZE_END); - gtk_misc_set_alignment (GTK_MISC (wizard->m_title_label), 0, 0); + gtk_misc_set_alignment (GTK_MISC (wizard->m_title_label), 0, 0.5); // setup label look gtk_widget_modify_fg (wizard->m_title_label, GTK_STATE_NORMAL, Added: trunk/gtk/unstable/tests/MultiProgressMeter.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable/tests/MultiProgress… ============================================================================== --- trunk/gtk/unstable/tests/MultiProgressMeter.ycp (added) +++ trunk/gtk/unstable/tests/MultiProgressMeter.ycp Mon Dec 3 21:13:26 2007 @@ -0,0 +1,30 @@ +// Simple example for MultiProgressMeter +{ + UI::OpenDialog( + `VBox( + `VMultiProgressMeter(`id(`vprog), [ 100, 200, 500, 20, 100 ] ), + `HMultiProgressMeter(`id(`hprog), [ 100, 200, 500, 20, 100 ] ), + `PushButton(`opt(`default), "&Ok" ) + ) + ); + + UI::ChangeWidget(`vprog, `Values, [ 200, 200, 500, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 200, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 200, 500, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 100, 500, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 100, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 20, 500, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 20, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 0, 500, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 0, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 0, 400, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 0, 400, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 0, 300, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 0, 300, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 0, 200, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 0, 200, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 0, 100, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 0, 100, 20, 100 ] ); UI::UserInput(); +} + -- 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] r42638 - /trunk/gtk/unstable/tests/MultiProgressMeterVer.ycp
by rpmcruz＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: rpmcruz Date: Mon Dec 3 21:12:57 2007 New Revision: 42638 URL: http://svn.opensuse.org/viewcvs/yast?rev=42638&view=rev Log: t Modified: trunk/gtk/unstable/tests/MultiProgressMeterVer.ycp Modified: trunk/gtk/unstable/tests/MultiProgressMeterVer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable/tests/MultiProgress… ============================================================================== --- trunk/gtk/unstable/tests/MultiProgressMeterVer.ycp (original) +++ trunk/gtk/unstable/tests/MultiProgressMeterVer.ycp Mon Dec 3 21:12:57 2007 @@ -1,39 +1,36 @@ // Simple example for MultiProgressMeter { - if ( ! UI::HasSpecialWidget(`HMultiProgressMeter ) ) - { - UI::OpenDialog( - `VBox( - `Label("Error: This UI doesn't support the MultiProgressMeter widget!"), - `PushButton(`opt(`default), "&OK") - ) - ); - UI::UserInput(); - UI::CloseDialog(); - - return; - } - - UI::OpenDialog( `VBox( - `VMultiProgressMeter(`id(`prog), [ 100, 200, 500, 20, 100 ] ), + `VMultiProgressMeter(`id(`vprog), [ 100, 200, 500, 20, 100 ] ), + `HMultiProgressMeter(`id(`hprog), [ 100, 200, 500, 20, 100 ] ), `PushButton(`opt(`default), "&Ok" ) ) ); - UI::ChangeWidget(`prog, `Values, [ 1000, 200, 500, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 800, 200, 500, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 500, 200, 500, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 200, 200, 500, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 0, 200, 500, 20, 100 ] ); UI::UserInput(); - - UI::ChangeWidget(`prog, `Values, [ 0, 100, 500, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 0, 20, 500, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 0, 0, 500, 20, 100 ] ); UI::UserInput(); - - UI::ChangeWidget(`prog, `Values, [ 0, 0, 400, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 0, 0, 300, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 0, 0, 200, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 0, 0, 100, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 1000, 200, 500, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 1000, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 800, 200, 500, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 800, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 500, 200, 500, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 500, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 200, 200, 500, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 200, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 200, 500, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 100, 500, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 100, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 20, 500, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 20, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 0, 500, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 0, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 0, 400, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 0, 400, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 0, 300, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 0, 300, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 0, 200, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 0, 200, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`vprog, `Values, [ 0, 0, 100, 20, 100 ] ); + UI::ChangeWidget(`hprog, `Values, [ 0, 0, 100, 20, 100 ] ); UI::UserInput(); } + -- 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] r42637 - /branches/tmp/coolo/qt4-port/src/YQWizard.cc
by coolo＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: coolo Date: Mon Dec 3 19:20:54 2007 New Revision: 42637 URL: http://svn.opensuse.org/viewcvs/yast?rev=42637&view=rev Log: fix layout Modified: branches/tmp/coolo/qt4-port/src/YQWizard.cc Modified: branches/tmp/coolo/qt4-port/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWiza… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizard.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWizard.cc Mon Dec 3 19:20:54 2007 @@ -331,7 +331,7 @@ step->setNameLabel( label ); _stepsGrid->addWidget( label, row, statusCol, - 1, nameCol - statusCol ); + 1, nameCol - statusCol + 1); } else // No heading - ordinary step { -- 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] r42636 - /branches/tmp/coolo/qt4-port/src/
by coolo＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: coolo Date: Mon Dec 3 19:16:24 2007 New Revision: 42636 URL: http://svn.opensuse.org/viewcvs/yast?rev=42636&view=rev Log: give duncan something to grep for :) Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc branches/tmp/coolo/qt4-port/src/YQDateField.cc branches/tmp/coolo/qt4-port/src/YQDateField.h branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc branches/tmp/coolo/qt4-port/src/YQFrame.cc branches/tmp/coolo/qt4-port/src/YQFrame.h branches/tmp/coolo/qt4-port/src/YQIconPool.h branches/tmp/coolo/qt4-port/src/YQLabel.cc branches/tmp/coolo/qt4-port/src/YQLogView.cc branches/tmp/coolo/qt4-port/src/YQLogView.h branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc branches/tmp/coolo/qt4-port/src/YQRadioButton.h Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/CMakeL… ============================================================================== --- branches/tmp/coolo/qt4-port/src/CMakeLists.txt (original) +++ branches/tmp/coolo/qt4-port/src/CMakeLists.txt Mon Dec 3 19:16:24 2007 @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_QT3SUPPORT_INCLUDE_DIR} "${CMAKE_SOURCE_DIR}/src/pkg" ) +INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_SOURCE_DIR}/src/pkg" ) ADD_DEFINITIONS( -DY2LOG=\\\"QT4\\\" ${QT_DEFINITIONS} Modified: branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQChec… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc Mon Dec 3 19:16:24 2007 @@ -21,7 +21,6 @@ #include <ycp/y2log.h> #include <qcheckbox.h> //Added by qt3to4: -#include <q3frame.h> #include <Q3GroupBox> #include <qevent.h> #include "YQUI.h" Modified: branches/tmp/coolo/qt4-port/src/YQDateField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDate… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDateField.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQDateField.cc Mon Dec 3 19:16:24 2007 @@ -21,7 +21,6 @@ #include <ycp/y2log.h> #include <qdatetimeedit.h> -#include <q3datetimeedit.h> #include <QVBoxLayout> #include "utf8.h" Modified: branches/tmp/coolo/qt4-port/src/YQDateField.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDate… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDateField.h (original) +++ branches/tmp/coolo/qt4-port/src/YQDateField.h Mon Dec 3 19:16:24 2007 @@ -21,9 +21,10 @@ #define YQDateField_h #include <QFrame> +#include <Qt3Support/Q3DateEdit> + #include "YDateField.h" -class Q3DateEdit; class YQWidgetCaption; Modified: branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDown… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc Mon Dec 3 19:16:24 2007 @@ -18,7 +18,6 @@ #include <qlabel.h> -#include <q3progressbar.h> #include <qtimer.h> #define y2log_component "qt-ui" #include <ycp/y2log.h> Modified: branches/tmp/coolo/qt4-port/src/YQFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQFram… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQFrame.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQFrame.cc Mon Dec 3 19:16:24 2007 @@ -22,7 +22,6 @@ #include "YQUI.h" #include "utf8.h" //Added by qt3to4: -#include <q3frame.h> using std::max; Modified: branches/tmp/coolo/qt4-port/src/YQFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQFram… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQFrame.h (original) +++ branches/tmp/coolo/qt4-port/src/YQFrame.h Mon Dec 3 19:16:24 2007 @@ -20,9 +20,9 @@ #ifndef YQFrame_h #define YQFrame_h -#include <Qt3Support/q3groupbox.h> #include "YFrame.h" +#include <Qt3Support/Q3GroupBox> class QWidget; Modified: branches/tmp/coolo/qt4-port/src/YQIconPool.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQIcon… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQIconPool.h (original) +++ branches/tmp/coolo/qt4-port/src/YQIconPool.h Mon Dec 3 19:16:24 2007 @@ -21,7 +21,7 @@ #define YQIconPool_h #include <qpixmap.h> -#include <q3ptrdict.h> +#include <Qt3Support/Q3PtrDict> class YQIconPool { Modified: branches/tmp/coolo/qt4-port/src/YQLabel.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQLabe… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQLabel.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQLabel.cc Mon Dec 3 19:16:24 2007 @@ -25,7 +25,6 @@ #include "YQApplication.h" #include "YQLabel.h" //Added by qt3to4: -#include <q3frame.h> #include <qlabel.h> Modified: branches/tmp/coolo/qt4-port/src/YQLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQLogV… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQLogView.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQLogView.cc Mon Dec 3 19:16:24 2007 @@ -19,7 +19,6 @@ #include <qlabel.h> #include <qstyle.h> -#include <q3multilineedit.h> #include <QVBoxLayout> #define y2log_component "qt-ui" #include <ycp/y2log.h> Modified: branches/tmp/coolo/qt4-port/src/YQLogView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQLogV… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQLogView.h (original) +++ branches/tmp/coolo/qt4-port/src/YQLogView.h Mon Dec 3 19:16:24 2007 @@ -21,11 +21,11 @@ #define YQLogView_h #include <QFrame> +#include <Qt3Support/Q3MultiLineEdit> #include "YLogView.h" class YQWidgetCaption; -class Q3MultiLineEdit; class YQLogView : public QFrame, public YLogView Modified: branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMult… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc Mon Dec 3 19:16:24 2007 @@ -17,7 +17,6 @@ /-*/ -#include <q3multilineedit.h> #include <QVBoxLayout> #include <QTextEdit> #include <qlabel.h> Modified: branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMult… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc Mon Dec 3 19:16:24 2007 @@ -21,10 +21,7 @@ #include <ycp/y2log.h> #include <qevent.h> -//Added by qt3to4: -#include <q3pointarray.h> -#include <qevent.h> -#include <qevent.h> +#include <Qt3Support/Q3PointArray> #include "YQUI.h" #include "YQMultiProgressMeter.h" @@ -260,7 +257,7 @@ { Q3PointArray points( 4 ); int p=0; - + points.setPoint( p++, offset + fillStart, border + fillHeight ); points.setPoint( p++, offset + fillStart, border + thickness - fillHeight ); points.setPoint( p++, offset + length, border + thickness - indent ); @@ -277,7 +274,7 @@ { Q3PointArray points( 4 ); int p=0; - + points.setPoint( p++, offset, border + thickness ); points.setPoint( p++, offset, border ); points.setPoint( p++, offset + fillStart, border + fillHeight ); @@ -334,7 +331,7 @@ const QBrush & color = palette().foreground(); painter.setBrush( color ); // painter.setBrush( NoBrush ); - + // Draw upper marker triangle Modified: branches/tmp/coolo/qt4-port/src/YQRadioButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRadi… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRadioButton.h (original) +++ branches/tmp/coolo/qt4-port/src/YQRadioButton.h Mon Dec 3 19:16:24 2007 @@ -20,9 +20,8 @@ #ifndef YQRadioButton_h #define YQRadioButton_h -#include <q3groupbox.h> #include "YRadioButton.h" - +#include <Qt3Support/Q3GroupBox> class QRadioButton; -- 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] r42635 - in /branches/tmp/coolo/qt4-port/src: YQWizard.cc YQWizard.h
by coolo＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: coolo Date: Mon Dec 3 19:11:48 2007 New Revision: 42635 URL: http://svn.opensuse.org/viewcvs/yast?rev=42635&view=rev Log: getting rid of QT3_SUPPORT here too (added FIXMEs) Modified: branches/tmp/coolo/qt4-port/src/YQWizard.cc branches/tmp/coolo/qt4-port/src/YQWizard.h Modified: branches/tmp/coolo/qt4-port/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWiza… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizard.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWizard.cc Mon Dec 3 19:11:48 2007 @@ -18,8 +18,6 @@ /-*/ -#define QT3_SUPPORT - #include "YQWizard.h" #define y2log_component "qt-wizard" #include <ycp/y2log.h> @@ -34,8 +32,6 @@ #include <QPainter> #include <QStackedWidget> #include "ui_QHelpDialog.h" -#include <q3hbox.h> -#include <q3header.h> #include <qimage.h> #include <qlabel.h> #include <qlayout.h> @@ -43,21 +39,14 @@ #include <qmenudata.h> #include <qobject.h> #include <qpixmap.h> -#include <q3popupmenu.h> #include <qpushbutton.h> #include <qregexp.h> #include <qtabwidget.h> -#include <q3textbrowser.h> #include <qtoolbutton.h> -#include <q3widgetstack.h> #include "QY2ListView.h" -//Added by qt3to4: -#include <q3boxlayout.h> #include <QGridLayout> -#include <q3frame.h> #include <qevent.h> -#include <q3boxlayout.h> #include "utf8.h" #include "YQi18n.h" @@ -135,8 +124,8 @@ _sendButtonEvents = true; _contentsReplacePoint = 0; - _stepsList.setAutoDelete( true ); - _stepsIDs.setAutoDelete( false ); // Only for one of both! + //FIXME _stepsList.setAutoDelete( true ); + //FIXME _stepsIDs.setAutoDelete( false ); // Only for one of both! YQUI::setTextdomain( TEXTDOMAIN ); @@ -157,9 +146,10 @@ void YQWizard::layoutTitleBar( QWidget * parent ) { - Q3HBox * titleBar = new Q3HBox( parent ); + QFrame * titleBar = new QFrame( parent ); YUI_CHECK_NEW( titleBar ); + QHBoxLayout *layout = new QHBoxLayout( titleBar ); titleBar->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert // @@ -167,6 +157,7 @@ // QLabel * left = new QLabel( titleBar ); + layout->addWidget( left ); left->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert QPixmap leftLogo( PIXMAP_DIR "title-bar-left.png" ); @@ -175,7 +166,6 @@ { left->setPixmap( leftLogo ); left->setFixedSize( leftLogo.size() ); - left->setBackgroundOrigin( QWidget::ParentOrigin ); } @@ -183,7 +173,7 @@ // Center stretch space // - addHStretch( titleBar ); + layout->addStretch( 10 ); // @@ -193,13 +183,14 @@ QLabel * right = new QLabel( titleBar ); YUI_CHECK_NEW( right ); + layout->addWidget( right ); + QPixmap rightLogo( PIXMAP_DIR "title-bar-right.png" ); if ( ! rightLogo.isNull() ) { right->setPixmap( rightLogo ); right->setFixedSize( rightLogo.size() ); - right->setBackgroundOrigin( QWidget::ParentOrigin ); } } @@ -265,7 +256,7 @@ y2error( "Step ID \"%s\" (\"%s\") already used for \"%s\"", id.c_str(), text.c_str(), - (const char *) _stepsIDs[ qId ]->name() ); + qPrintable( _stepsIDs[ qId ]->name() ) ); return; } @@ -323,10 +314,9 @@ // Create widgets for all steps and step headings in the internal list // - YQWizard::Step * step = _stepsList.first(); - - while ( step ) + for ( QList<Step*>::iterator i = _stepsList.begin(); i != _stepsList.end(); ++i) { + YQWizard::Step * step = *i; if ( step->isHeading() ) { // @@ -339,9 +329,9 @@ label->setProperty( "class", "steps_heading" ); step->setNameLabel( label ); - _stepsGrid->addMultiCellWidget( label, - row, row, // from_row, to_row - statusCol, nameCol ); // from_col, to_col + _stepsGrid->addWidget( label, + row, statusCol, + 1, nameCol - statusCol ); } else // No heading - ordinary step { @@ -368,7 +358,6 @@ _stepsGrid->addWidget( nameLabel, row, nameCol ); } - step = _stepsList.next(); row++; } @@ -389,7 +378,7 @@ updateSteps(); YQWizard::Step * currentStep = findStep( _currentStepID ); - YQWizard::Step * step = _stepsList.first(); + QList<YQWizard::Step*>::iterator step = _stepsList.begin(); if ( currentStep ) { @@ -400,26 +389,26 @@ // Set all steps before the current to "done" // - while ( step && step != currentStep ) + while ( step != _stepsList.end() && *step != currentStep ) { - step->setStatus( Step::Done ); - step = _stepsList.next(); + ( *step )->setStatus( Step::Done ); + step++; } // Skip the current step - continue with the step after it - if ( step ) - step = _stepsList.next(); + if ( step != _stepsList.end() ) + step++; } // // Set all steps after the current to "to do" // - while ( step ) + while ( step != _stepsList.end() ) { - step->setStatus( Step::Todo ); - step = _stepsList.next(); + ( *step )->setStatus( Step::Todo ); + step++; } } @@ -513,36 +502,22 @@ } - -void YQWizard::layoutSideBarButtonBox( QWidget * parent, QPushButton * button ) -{ - QVBoxLayout * vbox = new QVBoxLayout( parent, 0, 0 ); // parent, margin, spacing - YUI_CHECK_NEW( vbox ); - - QHBoxLayout * hbox = new QHBoxLayout( vbox, 0 ); // parent, spacing - YUI_CHECK_NEW( hbox ); - - hbox->addStretch( 99 ); - hbox->addWidget( button ); - hbox->addStretch( 99 ); -} - - - void YQWizard::layoutTreePanel() { - _treePanel = new Q3HBox( _sideBar ); + _treePanel = new QFrame( _sideBar ); YUI_CHECK_NEW( _treePanel ); + QHBoxLayout *layout = new QHBoxLayout( _treePanel ); _sideBar->addWidget( _treePanel ); - Q3VBox * vbox = new Q3VBox( _treePanel ); + QVBoxLayout * vbox = new QVBoxLayout(); YUI_CHECK_NEW( vbox ); - + layout->addLayout( vbox ); // Selection tree - _tree = new QY2ListView( vbox ); + _tree = new QY2ListView( _treePanel ); YUI_CHECK_NEW( _tree ); + vbox->addWidget( _tree ); //FIXME // _tree->addColumn( "" ); @@ -560,33 +535,9 @@ connect( _tree, SIGNAL( doubleClicked ( QTreeWidgetItem * ) ), this, SLOT ( sendTreeEvent ( QTreeWidgetItem * ) ) ); - - // Bottom gradient - - QLabel * buttonBox = new QLabel( vbox ); - YUI_CHECK_NEW( buttonBox ); - - - // "Help" button - intentionally without keyboard shortcut - QPushButton * button = new QPushButton( _( "Help" ), buttonBox ); - YUI_CHECK_NEW( button ); - -#if USE_ICON_ON_HELP_BUTTON - QPixmap pixmap( PIXMAP_DIR "help-button.png" ); - - if ( ! pixmap.isNull() ) - button->setPixmap( pixmap ); -#endif - - layoutSideBarButtonBox( buttonBox, button ); - - connect( button, SIGNAL( clicked() ), - this, SLOT ( showHelp() ) ); - } - void YQWizard::addTreeItem( const string & parentID, const string & text, const string & id ) { QString qId = fromUTF8( id ); @@ -728,7 +679,8 @@ _dialogHeading = new QLabel( workArea ); YUI_CHECK_NEW( _dialogHeading ); headingHBox->addWidget( _dialogHeading ); - _dialogHeading->setAlignment( Qt::AlignLeft | Qt::WordBreak ); + _dialogHeading->setAlignment( Qt::AlignLeft ); + _dialogHeading->setWordWrap( true ); _dialogHeading->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert _dialogHeading->setObjectName( "DialogHeading" ); @@ -753,8 +705,9 @@ void YQWizard::layoutClientArea( QWidget * parent ) { - _clientArea = new Q3VBox( parent ); + _clientArea = new QFrame( parent ); YUI_CHECK_NEW( _clientArea ); + QVBoxLayout *layout = new QVBoxLayout( _clientArea ); // _clientArea->layout()->setMargin( 4 ); // @@ -763,6 +716,7 @@ _contents = new YQAlignment( this, _clientArea, YAlignCenter, YAlignCenter ); YUI_CHECK_NEW( _contents ); + layout->addWidget( _contents ); _contents->QObject::setProperty( "class", "Contents" ); _contents->setStretchable( YD_HORIZ, true ); @@ -905,13 +859,13 @@ else { _dialogIcon->setPixmap( icon ); - topLevelWidget()->setIcon( icon ); + topLevelWidget()->setWindowIcon( icon ); } } else { _dialogIcon->clear(); - topLevelWidget()->setIcon( QPixmap() ); + topLevelWidget()->setWindowIcon( QIcon() ); } } } @@ -933,7 +887,7 @@ if ( _dialogHeading ) { QString label = _dialogHeading->text(); - label.simplifyWhiteSpace(); // Replace any embedded newline with a single blank + label = label.simplified(); // Replace any embedded newline with a single blank if ( ! label.isEmpty() ) { @@ -1031,11 +985,11 @@ { if ( _menuBar ) { - Q3PopupMenu * menu = new Q3PopupMenu( _menuBar ); + QMenu * menu = new QMenu( _menuBar ); YUI_CHECK_NEW( menu ); _menuIDs.insert( fromUTF8( id ), menu ); - _menuBar->insertItem( fromUTF8( text ), menu ); + //FIXME _menuBar->insertItem( fromUTF8( text ), menu ); connect( menu, SIGNAL( activated ( int ) ), this, SLOT ( sendMenuEvent( int ) ) ); @@ -1049,15 +1003,15 @@ const string & text, const string & id ) { - Q3PopupMenu * parentMenu = _menuIDs[ fromUTF8( parentMenuID ) ]; + QMenu* parentMenu = _menuIDs[ fromUTF8( parentMenuID ) ]; if ( parentMenu ) { - Q3PopupMenu * menu = new Q3PopupMenu( _menuBar ); + QMenu * menu = new QMenu( _menuBar ); YUI_CHECK_NEW( menu ); _menuIDs.insert( fromUTF8( id ), menu ); - parentMenu->insertItem( fromUTF8( text ), menu ); + //FIXME parentMenu->insertItem( fromUTF8( text ), menu ); connect( menu, SIGNAL( activated ( int ) ), this, SLOT ( sendMenuEvent( int ) ) ); @@ -1073,13 +1027,13 @@ const string & text, const string & idString ) { - Q3PopupMenu * parentMenu = _menuIDs[ fromUTF8( parentMenuID ) ]; + QMenu * parentMenu = _menuIDs[ fromUTF8( parentMenuID ) ]; if ( parentMenu ) { int id = _menuEntryIDs.size(); _menuEntryIDs.push_back( idString ); - parentMenu->insertItem( fromUTF8( text ), id ); + //FIXME parentMenu->insertItem( fromUTF8( text ), id ); } else { @@ -1090,11 +1044,11 @@ void YQWizard::addMenuSeparator( const string & parentMenuID ) { - Q3PopupMenu * parentMenu = _menuIDs[ fromUTF8( parentMenuID ) ]; + QMenu * parentMenu = _menuIDs[ fromUTF8( parentMenuID ) ]; if ( parentMenu ) { - parentMenu->insertSeparator(); + parentMenu->addSeparator(); } else { Modified: branches/tmp/coolo/qt4-port/src/YQWizard.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWiza… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizard.h (original) +++ branches/tmp/coolo/qt4-port/src/YQWizard.h Mon Dec 3 19:11:48 2007 @@ -21,13 +21,9 @@ #define YQWizard_h #include <string> -#include <q3vbox.h> #include <qpixmap.h> -#include <q3ptrlist.h> #include <qstringlist.h> -#include <q3dict.h> #include "QY2ListView.h" -//Added by qt3to4: #include <QGridLayout> #include <qlabel.h> #include <QMenu> @@ -42,10 +38,8 @@ class QFrame; class QLabel; class QMenuBar; -class Q3PopupMenu; class QPushButton; class QSpacerItem; -class Q3TextBrowser; class QToolButton; class QStackedWidget; class YReplacePoint; @@ -533,7 +527,7 @@ QPushButton * _helpButton; QPushButton * _stepsButton; QPushButton * _treeButton; - Q3HBox * _treePanel; + QFrame * _treePanel; QY2ListView * _tree; QWidget * _clientArea; @@ -546,10 +540,10 @@ YQWizardButton * _nextButton; YReplacePoint * _contentsReplacePoint; - Q3PtrList<YQWizard::Step> _stepsList; - Q3Dict<YQWizard::Step> _stepsIDs; - Q3Dict<YQWizard::TreeItem> _treeIDs; - Q3Dict<Q3PopupMenu> _menuIDs; + QList<YQWizard::Step*> _stepsList; + QHash<QString,YQWizard::Step*> _stepsIDs; + QHash<QString,YQWizard::TreeItem*> _treeIDs; + QHash<QString,QMenu*> _menuIDs; vector<string> _menuEntryIDs; @@ -605,6 +599,9 @@ bool _enabled; QStringList _idList; Status _status; + + private: + Q_DISABLE_COPY(Step); }; @@ -622,6 +619,9 @@ virtual ~StepHeading() {} virtual bool isHeading() const { return true; } virtual bool hasID( const QString & id ) { return false; } + + private: + Q_DISABLE_COPY(StepHeading); }; -- 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] r42634 - /tags/stable-2_16_13/network/
by mzugec＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: mzugec Date: Mon Dec 3 18:54:55 2007 New Revision: 42634 URL: http://svn.opensuse.org/viewcvs/yast?rev=42634&view=rev Log: Created tag stable-2_16_13 for network Added: tags/stable-2_16_13/network/ - copied from r42633, trunk/network/ -- 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] r42633 - in /trunk/network: VERSION package/yast2-network.changes src/modules/Lan.ycp src/modules/LanItems.ycp
by mzugec＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: mzugec Date: Mon Dec 3 18:54:28 2007 New Revision: 42633 URL: http://svn.opensuse.org/viewcvs/yast?rev=42633&view=rev Log: modprobe ndiswrapper before hwinfo when needed (#343893) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Lan.ycp trunk/network/src/modules/LanItems.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=42633&r1=426… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Dec 3 18:54:28 2007 @@ -1 +1 @@ -2.16.12 +2.16.13 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Dec 3 18:54:28 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 3 18:54:09 CET 2007 - mzugec(a)suse.cz + +- modprobe ndiswrapper before hwinfo when needed (#343893) +- 2.16.13 + +------------------------------------------------------------------- Mon Dec 3 13:14:15 CET 2007 - mzugec(a)suse.cz - warning for NM and password (#225793) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon Dec 3 18:54:28 2007 @@ -38,6 +38,7 @@ import "FileUtils"; import "PackageSystem"; import "LanItems"; +import "ModuleLoading"; include "network/complex.ycp"; include "network/runtime.ycp"; @@ -199,14 +200,22 @@ if(!Confirm::MustBeRoot()) return false; + if(Abort()) return false; /* Progress step 1/9 */ - ProgressNextStage(_("Detecting network devices...")); - // if(!Arch::s390 ()) /* FIXME: Temporary hack until the detection is functional */ - - // Dont read hardware data in config mode - if(!Mode::config ()) { - if(!NetHwDetection::running) NetHwDetection::Start(); - LanItems::ReadHw(); + ProgressNextStage(_("Detecting for ndiswrapper...")); + // modprobe ndiswrapper before hwinfo when needed (#343893) + if (!Mode::autoinst() && PackageSystem::Installed("ndiswrapper")){ + y2milestone("ndiswrapper: installed"); + if (size((list<string>)SCR::Read(.target.dir, "/etc/ndiswrapper"))>0){ + y2milestone("ndiswrapper: configuration found"); + if ((integer)SCR::Execute(.target.bash, "lsmod |grep -q ndiswrapper")!=0 + && Popup::YesNo(_("There is ndiswrapper configuration detected +but kernel module wasn't modprobed. +Should I modprobe ndiswrapper?"))) { + if (ModuleLoading::Load("ndiswrapper", "", "", "", false, true)==`fail) Popup::Error(_("ndiswrapper kernel module wasn't loaded. +Check configuration manually.")); + } + } } /* ReadHardware(""); /* TESTING */ @@ -214,9 +223,13 @@ if(Abort()) return false; /* Progress step 2/9 */ - ProgressNextStage(_("Reading /etc/modprobe.conf...")); + ProgressNextStage(_("Detecting network devices...")); // FIXME: MOD // ReadModules(NetworkDevices::CardRegex["netcard"]:""); - LanItems::ReadNetworkModules(); + // Dont read hardware data in config mode + if(!Mode::config ()) { + if(!NetHwDetection::running) NetHwDetection::Start(); + LanItems::ReadHw(); + } sleep(sl); if(Abort()) return false; Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp… ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Mon Dec 3 18:54:28 2007 @@ -238,10 +238,6 @@ }); } -// temporary used for reading configurations without hwinfo -global void ReadNetworkModules(){ -} - // get list of all configurations for "netcard" macro in NetworkDevices module list<string> getNetworkDevices(){ list<string> confs=[]; -- 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] r42632 - /trunk/core/libyui/src/YDialog.h
by sh-sh-sh＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: sh-sh-sh Date: Mon Dec 3 18:51:36 2007 New Revision: 42632 URL: http://svn.opensuse.org/viewcvs/yast?rev=42632&view=rev Log: obsolete Modified: trunk/core/libyui/src/YDialog.h Modified: trunk/core/libyui/src/YDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YDialog.h?rev=42… ============================================================================== --- trunk/core/libyui/src/YDialog.h (original) +++ trunk/core/libyui/src/YDialog.h Mon Dec 3 18:51:36 2007 @@ -63,7 +63,7 @@ * Delete the topmost dialog. * * Will throw a YUINoDialogException if there is no dialog and 'doThrow' is - * 'true'. + * 'true'. * * Returns 'true' if there is another open dialog after deleting, * 'false' if there is none. @@ -153,11 +153,7 @@ **/ virtual void setDefaultButton( YPushButton * defaultButton ); - /** - * Implements the ui command queryWidget - **/ - YCPValue queryWidget( const YCPSymbol & property ); - + protected: static std::stack<YDialog *> _dialogStack; -- 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] r42631 - /branches/tmp/coolo/wizard-rework/
by coolo＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: coolo Date: Mon Dec 3 18:27:48 2007 New Revision: 42631 URL: http://svn.opensuse.org/viewcvs/yast?rev=42631&view=rev Log: merged in Removed: branches/tmp/coolo/wizard-rework/ -- 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] r42630 - in /branches/tmp/coolo/qt4-port: ./ src/ theme/
by coolo＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: coolo Date: Mon Dec 3 18:27:38 2007 New Revision: 42630 URL: http://svn.opensuse.org/viewcvs/yast?rev=42630&view=rev Log: merge in changes from wizard-rework. Still work in progress, but it's technically working :) Added: branches/tmp/coolo/qt4-port/theme/Os103-installer-mockup.png - copied unchanged from r42517, branches/tmp/coolo/wizard-rework/theme/Os103-installer-mockup.png branches/tmp/coolo/qt4-port/theme/alpha_dummy-1.svg - copied, changed from r42517, branches/tmp/coolo/wizard-rework/theme/alpha_dummy-1.svg branches/tmp/coolo/qt4-port/theme/g22503.png - copied unchanged from r42517, branches/tmp/coolo/wizard-rework/theme/g22503.png branches/tmp/coolo/qt4-port/theme/rect2174.png - copied unchanged from r42521, branches/tmp/coolo/wizard-rework/theme/rect2174.png Removed: branches/tmp/coolo/qt4-port/VERSION Modified: branches/tmp/coolo/qt4-port/VERSION.cmake branches/tmp/coolo/qt4-port/src/CMakeLists.txt branches/tmp/coolo/qt4-port/src/YQReplacePoint.cc branches/tmp/coolo/qt4-port/src/YQUI.h branches/tmp/coolo/qt4-port/src/YQUI_core.cc branches/tmp/coolo/qt4-port/src/YQWizard.cc branches/tmp/coolo/qt4-port/src/YQWizard.h branches/tmp/coolo/qt4-port/theme/background-1024x768.png branches/tmp/coolo/qt4-port/theme/step-current.png branches/tmp/coolo/qt4-port/theme/step-done.png branches/tmp/coolo/qt4-port/theme/step-todo.png branches/tmp/coolo/qt4-port/theme/style.qss Modified: branches/tmp/coolo/qt4-port/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/VERSION.cm… ============================================================================== --- branches/tmp/coolo/qt4-port/VERSION.cmake (original) +++ branches/tmp/coolo/qt4-port/VERSION.cmake Mon Dec 3 18:27:38 2007 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "3") +SET(VERSION_PATCH "6") Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/CMakeL… ============================================================================== --- branches/tmp/coolo/qt4-port/src/CMakeLists.txt (original) +++ branches/tmp/coolo/qt4-port/src/CMakeLists.txt Mon Dec 3 18:27:38 2007 @@ -49,7 +49,7 @@ INSTALL(TARGETS py2qt4 LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) -#ADD_SUBDIRECTORY(pkg) +ADD_SUBDIRECTORY(pkg) #SET_TARGET_PROPERTIES( y2lang_qt4 PROPERTIES PREFIX "" ) Modified: branches/tmp/coolo/qt4-port/src/YQReplacePoint.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRepl… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQReplacePoint.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQReplacePoint.cc Mon Dec 3 18:27:38 2007 @@ -35,7 +35,7 @@ void YQReplacePoint::showChild() { YWidget * child = firstChild(); - + if ( child ) { QWidget * qChild = (QWidget *) child->widgetRep(); Modified: branches/tmp/coolo/qt4-port/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI.h… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI.h (original) +++ branches/tmp/coolo/qt4-port/src/YQUI.h Mon Dec 3 18:27:38 2007 @@ -230,16 +230,14 @@ * * Reimplemented from YUI. **/ - virtual void blockEvents( bool block = true ) - { _event_handler.blockEvents( block ); } + virtual void blockEvents( bool block = true ); /** * Returns 'true' if events are currently blocked. * * Reimplemented from YUI. **/ - virtual bool eventsBlocked() const - { return _event_handler.eventsBlocked(); } + virtual bool eventsBlocked() const; /** * Returns the current product name @@ -631,6 +629,8 @@ **/ YSimpleEventHandler _event_handler; + int blocked_level; + /** * Saved normal palette **/ @@ -651,9 +651,9 @@ **/ bool _askedForLeftHandedMouse; - bool _ui_inited; - int _ui_argc; - char **_ui_argv; + bool _ui_inited; + int _ui_argc; + char **_ui_argv; }; #endif // YQUI_h Modified: branches/tmp/coolo/qt4-port/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_c… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_core.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_core.cc Mon Dec 3 18:27:38 2007 @@ -72,6 +72,7 @@ _leftHandedMouse = false; _askedForLeftHandedMouse = false; screenShotNameTemplate = ""; + blocked_level = 0; qInstallMsgHandler( qMessageHandler ); @@ -136,8 +137,9 @@ wflags |= Qt::FramelessWindowHint; } - _main_win = new QWidget( 0, 0, wflags ); // parent, name, wflags + _main_win = new QWidget( 0, wflags ); // parent, wflags _main_win->setFocusPolicy( Qt::StrongFocus ); + _main_win->setObjectName( "main_window" ); // Create widget stack for `opt(`defaultsize) dialogs QVBoxLayout *vbox = new QVBoxLayout( _main_win ); @@ -151,7 +153,8 @@ _main_win->installEventFilter( this ); #endif - _main_win->resize( _default_size ); + //_main_win->resize( _default_size ); + _main_win->setFixedSize( 1024, 768 ); if ( _fullscreen || ! _have_wm ) _main_win->move( 0, 0 ); @@ -442,7 +445,11 @@ { init_ui(); - // y2milestone( "userInput %ld", timeout_millisec ); + _event_handler.blockEvents( false ); + _eventLoop->wakeUp(); + blocked_level = 0; + + //y2milestone( "userInput %ld", timeout_millisec ); YEvent * event = 0; YQDialog * dialog = dynamic_cast<YQDialog *> ( YDialog::currentDialog( false ) ); @@ -462,12 +469,7 @@ normalCursor(); _do_exit_loop = true; // should exit_loop() be called in sendEvent()? - - while ( ! pendingEvent() ) - { - _eventLoop->processEvents(QEventLoop::WaitForMoreEvents); - } - + _eventLoop->exec(); _do_exit_loop = false; event = _event_handler.consumePendingEvent(); @@ -653,6 +655,31 @@ } +void YQUI::blockEvents( bool block ) +{ + if ( block ) + { + if ( ++blocked_level == 1 ) + { + _event_handler.blockEvents( true ); + _eventLoop->exit(); + } + } + else + { + if ( --blocked_level == 0 ) + { + _event_handler.blockEvents( false ); + _eventLoop->wakeUp(); + } + } +} + + +bool YQUI::eventsBlocked() const +{ + return _event_handler.eventsBlocked(); +} static void qMessageHandler( QtMsgType type, const char * msg ) Modified: branches/tmp/coolo/qt4-port/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWiza… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizard.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWizard.cc Mon Dec 3 18:27:38 2007 @@ -30,6 +30,9 @@ #include <YShortcut.h> #include <QDialog> +#include <QSvgRenderer> +#include <QPainter> +#include <QStackedWidget> #include "ui_QHelpDialog.h" #include <q3hbox.h> #include <q3header.h> @@ -140,7 +143,7 @@ //layoutTitleBar( this ); layout->addLayout( layoutSideBar( this ) ); - layout->addLayout( layoutWorkArea( this ) ); + layout->addWidget( layoutWorkArea( this ) ); } @@ -204,11 +207,10 @@ QLayout *YQWizard::layoutSideBar( QWidget * parent ) { - _sideBar = new Q3WidgetStack( parent ); + _sideBar = new QStackedWidget( parent ); YUI_CHECK_NEW( _sideBar ); _sideBar->setMinimumWidth( YQUI::ui()->defaultSize( YD_HORIZ ) / 5 ); _sideBar->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred ) ); // hor/vert - _sideBar->setMargin( 0 ); QVBoxLayout *vbox = new QVBoxLayout( ); vbox->addWidget( _sideBar ); @@ -232,8 +234,10 @@ void YQWizard::layoutStepsPanel() { // Steps - _stepsPanel = new QWidget( _sideBar ); + _stepsPanel = new QFrame( _sideBar ); _sideBar->addWidget( _stepsPanel ); + _sideBar->setObjectName( "steps" ); + _stepsPanel->setProperty( "class", "steps QFrame" ); // Steps panel bottom buttons ("Help", "Release Notes") @@ -444,6 +448,8 @@ void YQWizard::layoutHelpPanel() { + return; + // // Button box with bottom gradient // @@ -470,6 +476,7 @@ button = new QPushButton( _( "Steps" ), buttonBox ); YUI_CHECK_NEW( button ); _stepsButton = button; + _stepsButton->hide(); pixmap = QPixmap( PIXMAP_DIR "steps-button.png" ); } @@ -690,11 +697,14 @@ -QLayout *YQWizard::layoutWorkArea( QFrame * parent ) +QWidget *YQWizard::layoutWorkArea( QWidget * parent ) { - QVBoxLayout *vbox = new QVBoxLayout(); + QFrame *workArea = new QFrame( parent ); + workArea->setObjectName( "work_area" ); + + QVBoxLayout *vbox = new QVBoxLayout( workArea ); - _menuBar = new QMenuBar( parent ); + _menuBar = new QMenuBar( workArea ); YUI_CHECK_NEW( _menuBar ); _menuBar->hide(); // will be made visible when menus are added @@ -709,13 +719,13 @@ //headingHBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert vbox->addLayout( headingHBox ); - _dialogIcon = new QLabel( parent ); + _dialogIcon = new QLabel( workArea ); YUI_CHECK_NEW( _dialogIcon ); headingHBox->addWidget( _dialogIcon ); _dialogIcon->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) ); // hor/vert _dialogIcon->setObjectName( "DialogIcon" ); - _dialogHeading = new QLabel( parent ); + _dialogHeading = new QLabel( workArea ); YUI_CHECK_NEW( _dialogHeading ); headingHBox->addWidget( _dialogHeading ); _dialogHeading->setAlignment( Qt::AlignLeft | Qt::WordBreak ); @@ -726,17 +736,17 @@ // Client area (the part that belongs to the YCP application) // - layoutClientArea( parent ); + layoutClientArea( workArea ); vbox->addWidget( _clientArea ); // // Button box // - QLayout *bb = layoutButtonBox( parent ); + QLayout *bb = layoutButtonBox( workArea ); vbox->addLayout( bb ); - return vbox; + return workArea; } @@ -745,7 +755,7 @@ { _clientArea = new Q3VBox( parent ); YUI_CHECK_NEW( _clientArea ); - _clientArea->layout()->setMargin( 4 ); + // _clientArea->layout()->setMargin( 4 ); // // HVCenter for wizard contents @@ -753,6 +763,7 @@ _contents = new YQAlignment( this, _clientArea, YAlignCenter, YAlignCenter ); YUI_CHECK_NEW( _contents ); + _contents->QObject::setProperty( "class", "Contents" ); _contents->setStretchable( YD_HORIZ, true ); _contents->setStretchable( YD_VERT, true ); @@ -785,9 +796,8 @@ QHBoxLayout * hbox = new QHBoxLayout(); // parent, spacing YUI_CHECK_NEW( hbox ); - hbox->setSpacing( 5 ); - hbox->setMargin( 5 ); - + hbox->setSpacing( 0 ); + hbox->setMargin( 0 ); // Help button - intentionally without keyboard shortcut _helpButton = new QPushButton( _( "Help" ), parent ); @@ -837,6 +847,8 @@ // "Next" button // + hbox->addSpacing( 5 ); + _nextButton = new YQWizardButton( this, parent, _nextButtonLabel ); YUI_CHECK_NEW( _nextButton ); @@ -999,7 +1011,7 @@ { if ( _sideBar && _stepsPanel ) { - _sideBar->raiseWidget( _stepsPanel ); + _sideBar->setCurrentWidget( _stepsPanel ); } } @@ -1008,7 +1020,7 @@ { if ( _sideBar && _treePanel ) { - _sideBar->raiseWidget( _treePanel ); + _sideBar->setCurrentWidget( _treePanel ); } } @@ -1149,8 +1161,6 @@ _contents->setSize( contentsRect.width(), contentsRect.height() ); } - - bool YQWizard::eventFilter( QObject * obj, QEvent * ev ) { if ( ev->type() == QEvent::Resize && obj == _contents ) @@ -1177,6 +1187,8 @@ void YQWizard::showReleaseNotesButton( const string & label, const string & id ) { + return; // no longer supported! + if ( ! _releaseNotesButton ) { y2error( "NULL Release Notes button" ); @@ -1221,21 +1233,31 @@ void YQWizard::Step::setStatus( Status s ) { - if ( !_statusLabel || _status == s ) + if ( !_statusLabel || !_nameLabel || _status == s ) return; _status = s; if ( s == Todo ) - _statusLabel->setProperty( "class", "todo-step QLabel" ); + { + _statusLabel->setProperty( "class", "todo-step-status QLabel" ); + _nameLabel->setProperty( "class", "todo-step-name QLabel" ); + } if ( s == Done ) - _statusLabel->setProperty( "class", "done-step QLabel" ); + { + _statusLabel->setProperty( "class", "done-step-status QLabel" ); + _nameLabel->setProperty( "class", "done-step-name QLabel" ); + } if ( s == Current ) - _statusLabel->setProperty( "class", "current-step QLabel" ); + { + _statusLabel->setProperty( "class", "current-step-status QLabel" ); + _nameLabel->setProperty( "class", "current-step-name QLabel" ); + } qApp->style()->polish( _statusLabel ); + qApp->style()->polish( _nameLabel ); } #include "YQWizard.moc" Modified: branches/tmp/coolo/qt4-port/src/YQWizard.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWiza… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizard.h (original) +++ branches/tmp/coolo/qt4-port/src/YQWizard.h Mon Dec 3 18:27:38 2007 @@ -47,7 +47,7 @@ class QSpacerItem; class Q3TextBrowser; class QToolButton; -class Q3WidgetStack; +class QStackedWidget; class YReplacePoint; class QTreeWidgetItem; class YQAlignment; @@ -446,7 +446,7 @@ void layoutStepsPanel(); void layoutHelpPanel(); void layoutTreePanel(); - QLayout *layoutWorkArea ( QFrame * parentHBox ); + QWidget *layoutWorkArea ( QWidget * parent ); void layoutClientArea( QWidget * parent ); QLayout *layoutButtonBox( QWidget * parent ); @@ -526,7 +526,7 @@ QString _qHelpText; - Q3WidgetStack * _sideBar; + QStackedWidget * _sideBar; QWidget * _stepsPanel; QPushButton * _releaseNotesButton; string _releaseNotesButtonId; Copied: branches/tmp/coolo/qt4-port/theme/alpha_dummy-1.svg (from r42517, branches/tmp/coolo/wizard-rework/theme/alpha_dummy-1.svg) URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/theme/alph… ============================================================================== --- branches/tmp/coolo/wizard-rework/theme/alpha_dummy-1.svg (original) +++ branches/tmp/coolo/qt4-port/theme/alpha_dummy-1.svg Mon Dec 3 18:27:38 2007 @@ -145,10 +145,12 @@ inkscape:groupmode="layer" id="layer2" inkscape:label="thinks" - style="display:inline"> + style="display:none"> <g id="g2250" - transform="matrix(0.8193774,0,0,0.9887048,286.32606,-30.736663)"> + transform="matrix(0.8193774,0,0,0.9887048,286.32606,-30.736663)" + inkscape:export-xdpi="89.93" + inkscape:export-ydpi="89.93"> <rect ry="13.148517" rx="15.865705" @@ -169,4 +171,29 @@ style="opacity:0.72809664;fill:url(#radialGradient2256);fill-opacity:1;stroke:#4e9a06;stroke-width:1.0555644;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.94117647;display:inline" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer4" + inkscape:label="bg" + style="display:none"> + <image + y="2.0855021" + x="0.057330478" + id="image3214" + height="768" + width="1024" + sodipodi:absref="/home/coolo/prod/yast2/qt4/theme/background-1024x768.png" + xlink:href="background-1024x768.png" /> + </g> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="links" + style="display:inline"> + <path + style="fill:#bdd1be;fill-opacity:0.41445783;fill-rule:nonzero;stroke:none;stroke-width:0.55000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" + d="M 77.463272,60.120266 L 259.44856,60.120266 L 260.66485,589.20561 L 77.463272,590.4219 C 70.261272,590.4219 64.463272,584.6239 64.463272,577.4219 L 64.463272,73.120267 C 64.463272,65.918266 70.261272,60.120266 77.463272,60.120266 z " + id="rect2174" + sodipodi:nodetypes="ccccccc" /> + </g> </svg> Modified: branches/tmp/coolo/qt4-port/theme/background-1024x768.png URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/theme/back… ============================================================================== Binary files - no diff available. Modified: branches/tmp/coolo/qt4-port/theme/step-current.png URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/theme/step… ============================================================================== Binary files - no diff available. Modified: branches/tmp/coolo/qt4-port/theme/step-done.png URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/theme/step… ============================================================================== Binary files - no diff available. Modified: branches/tmp/coolo/qt4-port/theme/step-todo.png URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/theme/step… ============================================================================== Binary files - no diff available. Modified: branches/tmp/coolo/qt4-port/theme/style.qss URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/theme/styl… ============================================================================== --- branches/tmp/coolo/qt4-port/theme/style.qss (original) +++ branches/tmp/coolo/qt4-port/theme/style.qss Mon Dec 3 18:27:38 2007 @@ -1,23 +1,44 @@ -/* Hintergrund: background-$RESULTION */ -.YQWizard { - pbackground-image: url(bottom-gradient.png); +#main_window { background-image: url(background-1024x768.png); background-position: bottom; background-repeat: repeat-x; } -QDWidget { border-style: solid; border-width: 5px; } +#work_area { + background-image: url(g22503.png); + background-position: top left; + background-repeat: none; + background-origin: border; + background-clip: padding; + border-style: none; + padding-left: 0px; + padding-top: 50px; + padding-right: 110px; + padding-bottom: 80px; +} + +QDWidget { border-style: solid; border-width: 5px; } QWidget { color: white; } -/* We provide a min-width and min-height for push buttons - so that they look elegant regardless of the width of the text. */ +#steps +{ + background-image: url(rect2174.png); + background-position: top right; + background-repeat: none; + background-origin: border; + background-clip: padding; + border-style: none; + padding-left: 20px; + padding-top: 10px; + margin-top: 60px; + margin-left: 10px; + min-width: 195px; + max-width: 195px; +} + QPushButton { - padding: 3px; - margin-left: 20px; - min-width: 9ex; - min-height: 2.5ex; color: black; } @@ -25,32 +46,23 @@ color: black; } -/* Increase the padding, so the text is shifted when the button is - pressed. */ -QPushButton:pressed { - padding-left: 5px; - padding-top: 5px; - background-color: #d0d67c; +.current-step-name { + font: bold 10pt; } -/* Nice to have the background color change when hovered. */ -QRadioButton:hover, QCheckBox:hover { - background-color: wheat; -} - -.todo { +.todo-step-status { qproperty-pixmap: url(step-todo.png); max-width: 14px; min-width: 14px; } -.done { +.done-step-status { qproperty-pixmap: url(step-done.png); max-width: 14px; min-width: 14px; } -.current { +.current-step-status { qproperty-pixmap: url(step-current.png); max-width: 14px; min-width: 14px; @@ -58,12 +70,19 @@ .steps_heading { font: bold; - font-size: 14pt; + color: black; + margin-bottom: 7px; + font-size: 11pt; } -#DialogIcon {} +#DialogIcon { max-width: 0px; margin: 0px; } #DialogHeading { font-size: 20px; padding: 12pt; + color: white; + font-style: bold; + margin: 0px; } +.Contents QWidget { color: black; } + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0