June 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10461 - /trunk/dialogsolver/src/resgraphview.cpp
by schubi2＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: schubi2 Date: Thu Jun 26 09:58:31 2008 New Revision: 10461 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10461&view=rev Log: taking correct utf8 Modified: trunk/dialogsolver/src/resgraphview.cpp Modified: trunk/dialogsolver/src/resgraphview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/resgraphview.cp… ============================================================================== --- trunk/dialogsolver/src/resgraphview.cpp (original) +++ trunk/dialogsolver/src/resgraphview.cpp Thu Jun 26 09:58:31 2008 @@ -495,6 +495,9 @@ sm.truncate(47); sm+="..."; } + + sm = QString::fromUtf8(sm); + static QString csep = "</td><td>"; static QString rend = "</td></tr>"; static QString rstart = "<tr><td>"; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10460 - in /trunk/dialogsolver: ./ yast_plugin/
by schubi2＠svn.opensuse.org 25 Jun '08

25 Jun '08

Author: schubi2 Date: Wed Jun 25 18:40:08 2008 New Revision: 10460 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10460&view=rev Log: yast plugin for this widget Added: trunk/dialogsolver/yast_plugin/ trunk/dialogsolver/yast_plugin/CMakeLists.txt trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginIf.h trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginImpl.cc trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginImpl.h Modified: trunk/dialogsolver/CMakeLists.txt Modified: trunk/dialogsolver/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/CMakeLists.txt?rev=… ============================================================================== --- trunk/dialogsolver/CMakeLists.txt (original) +++ trunk/dialogsolver/CMakeLists.txt Wed Jun 25 18:40:08 2008 @@ -24,6 +24,7 @@ ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(yast_plugin) #ADD_SUBDIRECTORY(po) INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) Added: trunk/dialogsolver/yast_plugin/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/yast_plugin/CMakeLi… ============================================================================== --- trunk/dialogsolver/yast_plugin/CMakeLists.txt (added) +++ trunk/dialogsolver/yast_plugin/CMakeLists.txt Wed Jun 25 18:40:08 2008 @@ -0,0 +1,39 @@ +################################################################ +# Solver Dialog +################################################################ + +ADD_DEFINITIONS( + -DY2LOG=\\\"QT4\\\" ${QT_DEFINITIONS} + -DICONDIR=\\"${Y2QT_ICONDIR}\\" + -DLOCALEDIR=\\\"${Y2QT_LOCALEDIR}\\\" + -DTHEMEDIR=\\\"${Y2QT_THEMEDIR}\\\" + -DQTLIBDIR=\\\"${LIB_INSTALL_DIR}\\\" + -DPREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\" + ) +SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format-nonliteral -fmessage-length=0" ) + +SET(qt_solver_dialog_plugin_SRCS + +YQZyppSolverDialogPluginImpl.cc + ) + +QT4_AUTOMOC(${qt_solver_dialog_plugin_SRCS}) + +INCLUDE_DIRECTORIES( ${QT_INCLUDES} ) +INCLUDE_DIRECTORIES( ${CMAKE_INSTALL_PREFIX}/include/YaST2/yui ) +INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ) +INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) +INCLUDE_DIRECTORIES( ${CMAKE_INSTALL_PREFIX}/include/YaST2/yast2-qt ) +INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) + +ADD_LIBRARY( py2qt_zypp_solver_dialog SHARED ${qt_solver_dialog_plugin_SRCS} ) +TARGET_LINK_LIBRARIES( py2qt_zypp_solver_dialog yui) +TARGET_LINK_LIBRARIES( py2qt_zypp_solver_dialog ${QT_QTCORE_LIBRARY} ) +TARGET_LINK_LIBRARIES( py2qt_zypp_solver_dialog ${QT_QTGUI_LIBRARY} ) +TARGET_LINK_LIBRARIES( py2qt_zypp_solver_dialog qdialogsolver ) +SET_TARGET_PROPERTIES( py2qt_zypp_solver_dialog PROPERTIES SOVERSION 2 ) +SET_TARGET_PROPERTIES( py2qt_zypp_solver_dialog PROPERTIES LINK_FLAGS "-Wl,--no-undefined -Wl,-rpath -Wl,${CMAKE_INSTALL_PREFIX}/lib/YaST2/plugin" ) + +INSTALL(TARGETS py2qt_zypp_solver_dialog LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/YaST2/plugin" ) + + Added: trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginIf.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/yast_plugin/YQZyppS… ============================================================================== --- trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginIf.h (added) +++ trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginIf.h Wed Jun 25 18:40:08 2008 @@ -0,0 +1,34 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (c) SuSE Linux AG | +\----------------------------------------------------------------------/ + + File: YQZyppSolverDialogPluginIf.h + + Author: Stefan Schubert <schubi(a)suse.de> + + +/-*/ + +#ifndef YQZyppSolverDialogPluginIf_h +#define YQZyppSolverDialogPluginIf_h + +#include <zypp/PoolItem.h> + +class YQZyppSolverDialogPluginIf +{ + + public: + + virtual ~YQZyppSolverDialogPluginIf() {} + + virtual bool createZyppSolverDialog( const zypp::PoolItem item ) = 0 ; +}; +#endif Added: trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/yast_plugin/YQZyppS… ============================================================================== --- trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginImpl.cc (added) +++ trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginImpl.cc Wed Jun 25 18:40:08 2008 @@ -0,0 +1,48 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (c) SuSE Linux AG | +\----------------------------------------------------------------------/ + + File: YQZyppSolverDialogPluginImpl.cc + + Author: Stefan Schubert + +/-*/ + +#include "YQZyppSolverDialogPluginImpl.h" + +#define YUILogComponent "qt-solver-dialog" +#include <YUILog.h> +#include "zypp/QZyppSolverDialog.h" + +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : YQZyppSolverDialogPluginStub::createZyppSolverDialog +// METHOD TYPE : YWidget +// +// DESCRIPTION : +// +extern "C" { +YQZyppSolverDialogPluginImpl ZYPPDIALOGP; +} + +bool YQZyppSolverDialogPluginImpl::createZyppSolverDialog( const zypp::PoolItem item ) +{ + yuiMilestone() << "calling createZyppSolverDialog " << endl; + + QZyppSolverDialog *dialog = new QZyppSolverDialog(item); + dialog->setMinimumSize ( 700, 700 ); + dialog->show(); + + return true; +} + + Added: trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/yast_plugin/YQZyppS… ============================================================================== --- trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginImpl.h (added) +++ trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginImpl.h Wed Jun 25 18:40:08 2008 @@ -0,0 +1,36 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (c) SuSE Linux AG | +\----------------------------------------------------------------------/ + + File: YQZyppSolverDialogPluginImpl.h + + Author: Stefan Schubert <schubi(a)suse.de> + + +/-*/ + +#ifndef YQZyppSolverDialogPluginImpl_h +#define YQZyppSolverDialogPluginImpl_h + +#include "YQZyppSolverDialogPluginIf.h" +#include <zypp/PoolItem.h> + +class YQZyppSolverDialogPluginImpl : public YQZyppSolverDialogPluginIf +{ + + public: + + virtual ~YQZyppSolverDialogPluginImpl() {} + + virtual bool createZyppSolverDialog( const zypp::PoolItem item ); + +}; +#endif -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10459 - /trunk/zypper/src/locks.cc
by jkupec＠svn.opensuse.org 25 Jun '08

25 Jun '08

Author: jkupec Date: Wed Jun 25 16:08:56 2008 New Revision: 10459 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10459&view=rev Log: - one more string Modified: trunk/zypper/src/locks.cc Modified: trunk/zypper/src/locks.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/locks.cc?rev=10459&r1… ============================================================================== --- trunk/zypper/src/locks.cc (original) +++ trunk/zypper/src/locks.cc Wed Jun 25 16:08:56 2008 @@ -226,7 +226,7 @@ // nothing removed if (start == locks.size()) - zypper.out().info("No lock has been removed."); + zypper.out().info(_("No lock has been removed.")); //removed something else zypper.out().info(str::form(_PL( -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10458 - in /trunk/zypper/src: callbacks/locks.h locks.cc
by jkupec＠svn.opensuse.org 25 Jun '08

25 Jun '08

Author: jkupec Date: Wed Jun 25 14:27:47 2008 New Revision: 10458 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10458&view=rev Log: - fixed and added new texts Modified: trunk/zypper/src/callbacks/locks.h trunk/zypper/src/locks.cc Modified: trunk/zypper/src/callbacks/locks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/locks.h?rev… ============================================================================== --- trunk/zypper/src/callbacks/locks.h (original) +++ trunk/zypper/src/callbacks/locks.h Wed Jun 25 14:27:47 2008 @@ -17,15 +17,10 @@ { virtual Action conflict( const PoolQuery& query, ConflictState state ) { - //TODO localize - if (state==SAME_RESULTS) - { - Zypper::instance()->out().error("this query have lock same results as lock which you want remove:"); - } + if (state == SAME_RESULTS) + Zypper::instance()->out().error("The following query locks the same packages as the lock which you want remove:"); else - { - Zypper::instance()->out().error("this query lock some of objects, which you want unlock:"); - } + Zypper::instance()->out().error(_("The following query locks some of the objects you want to unlock:")); query.serialize(std::cout); @@ -38,7 +33,7 @@ { virtual Action execute( const PoolQuery& query ) { - Zypper::instance()->out().error("this query doesn't lock anything:"); + Zypper::instance()->out().error(_("The following query does not lock anything:")); query.serialize(std::cout); @@ -47,10 +42,9 @@ } }; - - } + class LocksCallbacks { private: zypp::LocksSaveReportReceiver _saveReport; Modified: trunk/zypper/src/locks.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/locks.cc?rev=10458&r1… ============================================================================== --- trunk/zypper/src/locks.cc (original) +++ trunk/zypper/src/locks.cc Wed Jun 25 14:27:47 2008 @@ -118,7 +118,6 @@ Locks::size_type start = 0; try { - Locks & locks = Locks::instance(); locks.read(); start = locks.size(); @@ -155,7 +154,10 @@ zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); } if ( start != Locks::instance().size() ) - zypper.out().info(_("Specified lock(-s) has been successfully added.")); + zypper.out().info(_PL( + "Specified lock has been successfully added.", + "Specified locks have been successfully added.", + Locks::instance().size() - start)); } @@ -222,14 +224,15 @@ locks.save(); - if (start==locks.size()) - { + // nothing removed + if (start == locks.size()) zypper.out().info("No lock has been removed."); - // nothing removed - } else { - zypper.out().info(str::form("Lock count has been succesfully decreased by: %lu",start-locks.size())); - //removed something - } + //removed something + else + zypper.out().info(str::form(_PL( + "%lu lock has been successfully removed.", + "%lu locks have been succesfully removed.", + start - locks.size()), start - locks.size())); } catch(const Exception & e) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10457 - /trunk/zypper/zypper.spec.cmake
by jkupec＠svn.opensuse.org 24 Jun '08

24 Jun '08

Author: jkupec Date: Tue Jun 24 21:29:02 2008 New Revision: 10457 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10457&view=rev Log: - there were quite some contributions from Pepa (Josef) :O) Modified: trunk/zypper/zypper.spec.cmake Modified: trunk/zypper/zypper.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/zypper.spec.cmake?rev=104… ============================================================================== --- trunk/zypper/zypper.spec.cmake (original) +++ trunk/zypper/zypper.spec.cmake Tue Jun 24 21:29:02 2008 @@ -37,6 +37,7 @@ Jan Kupec <jkupec(a)suse.cz> Duncan Mac-Vicar <dmacvicar(a)suse.de> Martin Vidner <mvidner(a)suse.cz> + Josef Reidinger <jreidinger(a)suse.cz> %prep %setup -q -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10456 - /trunk/zypper/src/
by jkupec＠svn.opensuse.org 24 Jun '08

24 Jun '08

Author: jkupec Date: Tue Jun 24 21:21:31 2008 New Revision: 10456 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10456&view=rev Log: - source tree reorganized, several file renames ----- #!/bin/bash RENAMES_LIST=../renames-list rm $RENAMES_LIST svn mv zypper.h Zypper.h svn mv zypper.cc Zypper.cc svn mv zypper-command.h Command.h svn mv zypper-command.cc Command.cc svn mv zypper-tabulator.h Table.h svn mv zypper-tabulator.cc Table.cc echo "zypper.h;Zypper.h" >> $RENAMES_LIST echo "zypper.cc;Zypper.cc" >> $RENAMES_LIST echo "zypper-command.h;Command.h" >> $RENAMES_LIST echo "zypper-command.cc;Command.cc" >> $RENAMES_LIST echo "zypper-tabulator.h;Table.h" >> $RENAMES_LIST echo "zypper-tabulator.cc;Table.cc" >> $RENAMES_LIST # move callback headers to separate folder and remove the -callbacks prefix mkdir callbacks svn add callbacks for file in $(ls *-callbacks.h); do newfile=${file%-callbacks\.h}; newfile="callbacks/${newfile:7}.h" echo "$file;$newfile" >> $RENAMES_LIST svn mv $file $newfile; done # remove 'zypper-' prefix from the sources for file in $(ls zypper-*); do echo "$file;${file:7}" >> $RENAMES_LIST svn mv $file ${file:7}; done # adapt include paths sed -i -e 's/zypper\.h/Zypper.h/g' $(grep -Rl 'zypper\.h' *) sed -i -e 's/zypper\.cc/Zypper.cc/g' $(grep -Rl 'zypper\.cc' *) sed -i -e 's/zypper-command\.$h\|cc$/Command.\1/g' $(grep -Rl 'zypper-command\.$h\|cc$' *) sed -i -e 's/zypper-tabulator\.$h\|cc$/Table.\1/g' $(grep -Rl 'zypper-tabulator\.$h\|cc$' *) sed -i -e 's/zypper-$\w*$-callbacks\.h/callbacks\/\1.h/g' $(grep -Rl 'zypper-\w*-callbacks\.h' *) sed -i -e 's/zypper-$.*\.\(h\|cc$\)/\1/g' $(grep -Rl 'zypper-.*\.$h\|cc$' *) for file in $(find -name '*.h'); do file1=${file:2} regex=${file1/\.h/\\\.h} regex=${regex/\//\\\/}; sed -i -e "s/\"$regex\"/\"..\\/$regex\"/g" callbacks/* done ----- zypper.h;Zypper.h zypper.cc;Zypper.cc zypper-command.h;Command.h zypper-command.cc;Command.cc zypper-tabulator.h;Table.h zypper-tabulator.cc;Table.cc zypper-keyring-callbacks.h;callbacks/keyring.h zypper-locks-callbacks.h;callbacks/locks.h zypper-media-callbacks.h;callbacks/media.h zypper-repo-callbacks.h;callbacks/repo.h zypper-rpm-callbacks.h;callbacks/rpm.h zypper-getopt.cc;getopt.cc zypper-getopt.h;getopt.h zypper-info.cc;info.cc zypper-info.h;info.h zypper-locks.cc;locks.cc zypper-locks.h;locks.h zypper-main.cc;main.cc zypper-main.h;main.h zypper-misc.cc;misc.cc zypper-misc.h;misc.h zypper-prompt.cc;prompt.cc zypper-prompt.h;prompt.h zypper-repos.cc;repos.cc zypper-repos.h;repos.h zypper-richtext.cc;richtext.cc zypper-richtext.h;richtext.h zypper-search.cc;search.cc zypper-search.h;search.h zypper-utils.cc;utils.cc zypper-utils.h;utils.h Added: trunk/zypper/src/Command.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-command.cc trunk/zypper/src/Command.h (props changed) - copied unchanged from r10453, trunk/zypper/src/zypper-command.h trunk/zypper/src/Table.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-tabulator.cc trunk/zypper/src/Table.h (props changed) - copied unchanged from r10453, trunk/zypper/src/zypper-tabulator.h trunk/zypper/src/Zypper.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper.cc trunk/zypper/src/Zypper.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper.h trunk/zypper/src/getopt.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-getopt.cc trunk/zypper/src/getopt.h (props changed) - copied unchanged from r10453, trunk/zypper/src/zypper-getopt.h trunk/zypper/src/info.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-info.cc trunk/zypper/src/info.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-info.h trunk/zypper/src/locks.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-locks.cc trunk/zypper/src/locks.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-locks.h trunk/zypper/src/main.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-main.cc trunk/zypper/src/main.h (props changed) - copied unchanged from r10453, trunk/zypper/src/zypper-main.h trunk/zypper/src/misc.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-misc.cc trunk/zypper/src/misc.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-misc.h trunk/zypper/src/prompt.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-prompt.cc trunk/zypper/src/prompt.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-prompt.h trunk/zypper/src/repos.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-repos.cc trunk/zypper/src/repos.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-repos.h trunk/zypper/src/richtext.cc (props changed) - copied unchanged from r10453, trunk/zypper/src/zypper-richtext.cc trunk/zypper/src/richtext.h (props changed) - copied unchanged from r10453, trunk/zypper/src/zypper-richtext.h trunk/zypper/src/search.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-search.cc trunk/zypper/src/search.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-search.h trunk/zypper/src/utils.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-utils.cc trunk/zypper/src/utils.h (props changed) - copied unchanged from r10453, trunk/zypper/src/zypper-utils.h Removed: trunk/zypper/src/zypper-command.cc trunk/zypper/src/zypper-command.h trunk/zypper/src/zypper-getopt.cc trunk/zypper/src/zypper-getopt.h trunk/zypper/src/zypper-info.cc trunk/zypper/src/zypper-info.h trunk/zypper/src/zypper-locks.cc trunk/zypper/src/zypper-locks.h trunk/zypper/src/zypper-main.cc trunk/zypper/src/zypper-main.h trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-misc.h trunk/zypper/src/zypper-prompt.cc trunk/zypper/src/zypper-prompt.h trunk/zypper/src/zypper-repos.cc trunk/zypper/src/zypper-repos.h trunk/zypper/src/zypper-richtext.cc trunk/zypper/src/zypper-richtext.h trunk/zypper/src/zypper-search.cc trunk/zypper/src/zypper-search.h trunk/zypper/src/zypper-tabulator.cc trunk/zypper/src/zypper-tabulator.h trunk/zypper/src/zypper-utils.cc trunk/zypper/src/zypper-utils.h trunk/zypper/src/zypper.cc trunk/zypper/src/zypper.h Modified: trunk/zypper/src/CMakeLists.txt Modified: trunk/zypper/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/CMakeLists.txt?rev=10… ============================================================================== --- trunk/zypper/src/CMakeLists.txt (original) +++ trunk/zypper/src/CMakeLists.txt Tue Jun 24 21:21:31 2008 @@ -6,39 +6,39 @@ MESSAGE ( "** Locale dir is ${INSTALL_PREFIX}/share/locale" ) SET (zypper_HEADERS - zypper.h - zypper-main.h - zypper-command.h - zypper-getopt.h - zypper-repos.h - zypper-misc.h - zypper-utils.h - zypper-search.h - zypper-info.h - zypper-prompt.h - zypper-richtext.h - zypper-tabulator.h - zypper-locks.h - zypper-keyring-callbacks.h - zypper-media-callbacks.h - zypper-rpm-callbacks.h - zypper-repo-callbacks.h + Zypper.h + main.h + Command.h + getopt.h + repos.h + misc.h + utils.h + search.h + info.h + prompt.h + richtext.h + Table.h + locks.h + callbacks/keyring.h + callbacks/media.h + callbacks/rpm.h + callbacks/repo.h ) SET( zypper_SRCS - zypper.cc - zypper-main.cc - zypper-command.cc - zypper-getopt.cc - zypper-repos.cc - zypper-misc.cc - zypper-utils.cc - zypper-search.cc - zypper-info.cc - zypper-tabulator.cc - zypper-prompt.cc - zypper-richtext.cc - zypper-locks.cc + Zypper.cc + main.cc + Command.cc + getopt.cc + repos.cc + misc.cc + utils.cc + search.cc + info.cc + Table.cc + prompt.cc + richtext.cc + locks.cc ${zypper_HEADERS} ) Copied: trunk/zypper/src/Command.cc (from r10453, trunk/zypper/src/zypper-command.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Command.cc?p2=trunk/z… ============================================================================== --- trunk/zypper/src/zypper-command.cc (original) +++ trunk/zypper/src/Command.cc Tue Jun 24 21:21:31 2008 @@ -3,8 +3,8 @@ #include "zypp/base/Exception.h" #include "zypp/base/String.h" -#include "zypper-main.h" -#include "zypper-command.h" +#include "main.h" +#include "Command.h" // redefine _ gettext macro defined by ZYpp #ifdef _ Copied: trunk/zypper/src/Table.cc (from r10453, trunk/zypper/src/zypper-tabulator.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Table.cc?p2=trunk/zyp… ============================================================================== --- trunk/zypper/src/zypper-tabulator.cc (original) +++ trunk/zypper/src/Table.cc Tue Jun 24 21:21:31 2008 @@ -5,7 +5,7 @@ #include "zypp/base/Logger.h" -#include "zypper-tabulator.h" +#include "Table.h" using namespace std; #include <wchar.h> Copied: trunk/zypper/src/Zypper.cc (from r10453, trunk/zypper/src/zypper.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?p2=trunk/zy… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Tue Jun 24 21:21:31 2008 @@ -33,18 +33,18 @@ #include "zypp/target/rpm/RpmHeader.h" // for install <.rpmURI> -#include "zypper-main.h" -#include "zypper.h" -#include "zypper-repos.h" -#include "zypper-misc.h" -#include "zypper-locks.h" - -#include "zypper-tabulator.h" -#include "zypper-search.h" -#include "zypper-info.h" -#include "zypper-getopt.h" -#include "zypper-command.h" -#include "zypper-utils.h" +#include "main.h" +#include "Zypper.h" +#include "repos.h" +#include "misc.h" +#include "locks.h" + +#include "Table.h" +#include "search.h" +#include "info.h" +#include "getopt.h" +#include "Command.h" +#include "utils.h" #include "output/OutNormal.h" #include "output/OutXML.h" Copied: trunk/zypper/src/Zypper.h (from r10453, trunk/zypper/src/zypper.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.h?p2=trunk/zyp… ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/Zypper.h Tue Jun 24 21:21:31 2008 @@ -14,8 +14,8 @@ #include "zypp/SrcPackage.h" #include "output/Out.h" -#include "zypper-command.h" -#include "zypper-getopt.h" +#include "Command.h" +#include "getopt.h" /** directory for storing manually installed (zypper install foo.rpm) RPM files */ Copied: trunk/zypper/src/getopt.cc (from r10453, trunk/zypper/src/zypper-getopt.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/getopt.cc?p2=trunk/zy… ============================================================================== --- trunk/zypper/src/zypper-getopt.cc (original) +++ trunk/zypper/src/getopt.cc Tue Jun 24 21:21:31 2008 @@ -1,5 +1,5 @@ -#include "zypper-getopt.h" -#include "zypper-main.h" +#include "getopt.h" +#include "main.h" #include <iostream> #include "zypp/base/String.h" Copied: trunk/zypper/src/info.cc (from r10453, trunk/zypper/src/zypper-info.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/info.cc?p2=trunk/zypp… ============================================================================== --- trunk/zypper/src/zypper-info.cc (original) +++ trunk/zypper/src/info.cc Tue Jun 24 21:21:31 2008 @@ -9,13 +9,13 @@ #include "zypp/Product.h" #include "zypp/PoolQuery.h" -#include "zypper.h" -#include "zypper-main.h" -#include "zypper-misc.h" -#include "zypper-tabulator.h" -#include "zypper-info.h" -#include "zypper-richtext.h" -#include "zypper-search.h" +#include "Zypper.h" +#include "main.h" +#include "misc.h" +#include "Table.h" +#include "info.h" +#include "richtext.h" +#include "search.h" using namespace std; Copied: trunk/zypper/src/info.h (from r10453, trunk/zypper/src/zypper-info.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/info.h?p2=trunk/zyppe… ============================================================================== --- trunk/zypper/src/zypper-info.h (original) +++ trunk/zypper/src/info.h Tue Jun 24 21:21:31 2008 @@ -5,7 +5,7 @@ #include "zypp/ResKind.h" #include "zypp/ui/Selectable.h" -#include "zypper.h" +#include "Zypper.h" void printInfo(const Zypper & zypper, const zypp::ResKind & kind); Copied: trunk/zypper/src/locks.cc (from r10453, trunk/zypper/src/zypper-locks.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/locks.cc?p2=trunk/zyp… ============================================================================== --- trunk/zypper/src/zypper-locks.cc (original) +++ trunk/zypper/src/locks.cc Tue Jun 24 21:21:31 2008 @@ -6,11 +6,11 @@ #include "zypp/Locks.h" #include "output/Out.h" -#include "zypper-main.h" -#include "zypper-tabulator.h" -#include "zypper-utils.h" -#include "zypper-locks.h" -#include "zypper-repos.h" +#include "main.h" +#include "Table.h" +#include "utils.h" +#include "locks.h" +#include "repos.h" using namespace zypp; using namespace std; Copied: trunk/zypper/src/locks.h (from r10453, trunk/zypper/src/zypper-locks.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/locks.h?p2=trunk/zypp… ============================================================================== --- trunk/zypper/src/zypper-locks.h (original) +++ trunk/zypper/src/locks.h Tue Jun 24 21:21:31 2008 @@ -1,7 +1,7 @@ #ifndef ZYPPERLOCKS_H_ #define ZYPPERLOCKS_H_ -#include "zypper.h" +#include "Zypper.h" void list_locks(Zypper & zypper); void add_locks(Zypper & zypper, const Zypper::ArgList & args, const ResKindSet & kinds); Copied: trunk/zypper/src/main.cc (from r10453, trunk/zypper/src/zypper-main.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/main.cc?p2=trunk/zypp… ============================================================================== --- trunk/zypper/src/zypper-main.cc (original) +++ trunk/zypper/src/main.cc Tue Jun 24 21:21:31 2008 @@ -5,14 +5,14 @@ #include "zypp/base/Logger.h" #include "zypp/base/LogControl.h" -#include "zypper-main.h" -#include "zypper.h" +#include "main.h" +#include "Zypper.h" -#include "zypper-rpm-callbacks.h" -#include "zypper-keyring-callbacks.h" -#include "zypper-repo-callbacks.h" -#include "zypper-media-callbacks.h" -#include "zypper-locks-callbacks.h" +#include "callbacks/rpm.h" +#include "callbacks/keyring.h" +#include "callbacks/repo.h" +#include "callbacks/media.h" +#include "callbacks/locks.h" using namespace std; Copied: trunk/zypper/src/misc.cc (from r10453, trunk/zypper/src/zypper-misc.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/misc.cc?p2=trunk/zypp… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/misc.cc Tue Jun 24 21:21:31 2008 @@ -23,15 +23,15 @@ #include "zypp/RepoInfo.h" -#include "zypper.h" -#include "zypper-main.h" -#include "zypper-utils.h" -#include "zypper-getopt.h" -#include "zypper-richtext.h" -#include "zypper-prompt.h" +#include "Zypper.h" +#include "main.h" +#include "utils.h" +#include "getopt.h" +#include "richtext.h" +#include "prompt.h" #include "output/prompt.h" -#include "zypper-misc.h" +#include "misc.h" using namespace std; using namespace zypp; Copied: trunk/zypper/src/misc.h (from r10453, trunk/zypper/src/zypper-misc.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/misc.h?p2=trunk/zyppe… ============================================================================== --- trunk/zypper/src/zypper-misc.h (original) +++ trunk/zypper/src/misc.h Tue Jun 24 21:21:31 2008 @@ -15,9 +15,9 @@ #include "zypp/ResKind.h" #include "zypp/PoolItem.h" -#include "zypper.h" -#include "zypper-tabulator.h" -#include "zypper-utils.h" +#include "Zypper.h" +#include "Table.h" +#include "utils.h" zypp::ResKind string_to_kind (const std::string & skind); Copied: trunk/zypper/src/prompt.cc (from r10453, trunk/zypper/src/zypper-prompt.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/prompt.cc?p2=trunk/zy… ============================================================================== --- trunk/zypper/src/zypper-prompt.cc (original) +++ trunk/zypper/src/prompt.cc Tue Jun 24 21:21:31 2008 @@ -8,8 +8,8 @@ #include "zypp/base/Logger.h" #include "zypp/base/String.h" -#include "zypper.h" -#include "zypper-prompt.h" +#include "Zypper.h" +#include "prompt.h" using namespace std; using namespace boost; Copied: trunk/zypper/src/prompt.h (from r10453, trunk/zypper/src/zypper-prompt.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/prompt.h?p2=trunk/zyp… ============================================================================== --- trunk/zypper/src/zypper-prompt.h (original) +++ trunk/zypper/src/prompt.h Tue Jun 24 21:21:31 2008 @@ -2,7 +2,7 @@ #define ZYPPERPROMPT_H_ #include "output/prompt.h" -#include "zypper-main.h" // for gettext macros +#include "main.h" // for gettext macros class PromptOptions { Copied: trunk/zypper/src/repos.cc (from r10453, trunk/zypper/src/zypper-repos.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.cc?p2=trunk/zyp… ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/repos.cc Tue Jun 24 21:21:31 2008 @@ -18,13 +18,13 @@ #include "zypp/media/MediaException.h" #include "zypp/media/MediaAccess.h" -#include "zypper.h" +#include "Zypper.h" #include "output/Out.h" -#include "zypper-main.h" -#include "zypper-getopt.h" -#include "zypper-tabulator.h" -#include "zypper-utils.h" -#include "zypper-repos.h" +#include "main.h" +#include "getopt.h" +#include "Table.h" +#include "utils.h" +#include "repos.h" using namespace std; using namespace boost; Copied: trunk/zypper/src/repos.h (from r10453, trunk/zypper/src/zypper-repos.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.h?p2=trunk/zypp… ============================================================================== --- trunk/zypper/src/zypper-repos.h (original) +++ trunk/zypper/src/repos.h Tue Jun 24 21:21:31 2008 @@ -6,7 +6,7 @@ #include "zypp/Url.h" #include "zypp/RepoInfo.h" -#include "zypper.h" +#include "Zypper.h" #define TMP_RPM_REPO_ALIAS "_tmpRPMcache_" Copied: trunk/zypper/src/search.cc (from r10453, trunk/zypper/src/zypper-search.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/search.cc?p2=trunk/zy… ============================================================================== --- trunk/zypper/src/zypper-search.cc (original) +++ trunk/zypper/src/search.cc Tue Jun 24 21:21:31 2008 @@ -8,12 +8,12 @@ #include "zypp/ResPoolProxy.h" -#include "zypper.h" -#include "zypper-main.h" -#include "zypper-tabulator.h" +#include "Zypper.h" +#include "main.h" +#include "Table.h" -#include "zypper-search.h" +#include "search.h" using namespace zypp; using namespace std; Copied: trunk/zypper/src/search.h (from r10453, trunk/zypper/src/zypper-search.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/search.h?p2=trunk/zyp… ============================================================================== --- trunk/zypper/src/zypper-search.h (original) +++ trunk/zypper/src/search.h Tue Jun 24 21:21:31 2008 @@ -15,9 +15,9 @@ #include "zypp/PoolItem.h" #include "zypp/Patch.h" -#include "zypper.h" -#include "zypper-utils.h" // for kind_to_string_localized -#include "zypper-tabulator.h" +#include "Zypper.h" +#include "utils.h" // for kind_to_string_localized +#include "Table.h" std::string selectable_search_repo_str(const zypp::ui::Selectable & s); std::string string_ppp_status(const zypp::PoolItem & pi); Copied: trunk/zypper/src/utils.cc (from r10453, trunk/zypper/src/zypper-utils.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/utils.cc?p2=trunk/zyp… ============================================================================== --- trunk/zypper/src/zypper-utils.cc (original) +++ trunk/zypper/src/utils.cc Tue Jun 24 21:21:31 2008 @@ -11,9 +11,9 @@ #include "zypp/parser/xml_escape_parser.hpp" #include "zypp/Capability.h" -#include "zypper.h" -#include "zypper-main.h" -#include "zypper-utils.h" +#include "Zypper.h" +#include "main.h" +#include "utils.h" using namespace std; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10455 - in /trunk/zypper/src: ./ callbacks/
by jkupec＠svn.opensuse.org 24 Jun '08

24 Jun '08

Author: jkupec Date: Tue Jun 24 21:20:10 2008 New Revision: 10455 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10455&view=rev Log: - renaming source tree part one Added: trunk/zypper/src/callbacks/keyring.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-keyring-callbacks.h trunk/zypper/src/callbacks/locks.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-locks-callbacks.h trunk/zypper/src/callbacks/media.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-media-callbacks.h trunk/zypper/src/callbacks/repo.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-repo-callbacks.h trunk/zypper/src/callbacks/rpm.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-rpm-callbacks.h Removed: trunk/zypper/src/zypper-keyring-callbacks.h trunk/zypper/src/zypper-locks-callbacks.h trunk/zypper/src/zypper-media-callbacks.h trunk/zypper/src/zypper-repo-callbacks.h trunk/zypper/src/zypper-rpm-callbacks.h Copied: trunk/zypper/src/callbacks/keyring.h (from r10453, trunk/zypper/src/zypper-keyring-callbacks.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/keyring.h?p… ============================================================================== --- trunk/zypper/src/zypper-keyring-callbacks.h (original) +++ trunk/zypper/src/callbacks/keyring.h Tue Jun 24 21:20:10 2008 @@ -20,7 +20,7 @@ #include "zypp/KeyRing.h" #include "zypp/Digest.h" -#include "zypper-prompt.h" +#include "../prompt.h" /////////////////////////////////////////////////////////////////// namespace zypp { Copied: trunk/zypper/src/callbacks/locks.h (from r10453, trunk/zypper/src/zypper-locks-callbacks.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/locks.h?p2=… ============================================================================== --- trunk/zypper/src/zypper-locks-callbacks.h (original) +++ trunk/zypper/src/callbacks/locks.h Tue Jun 24 21:20:10 2008 @@ -7,9 +7,9 @@ #include "zypp/ZYppCallbacks.h" #include "zypp/PoolQuery.h" -#include "zypper-prompt.h" -#include "zypper-utils.h" -#include "output/prompt.h" +#include "../prompt.h" +#include "../utils.h" +#include "../output/prompt.h" namespace zypp { Copied: trunk/zypper/src/callbacks/media.h (from r10453, trunk/zypper/src/zypper-media-callbacks.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/media.h?p2=… ============================================================================== --- trunk/zypper/src/zypper-media-callbacks.h (original) +++ trunk/zypper/src/callbacks/media.h Tue Jun 24 21:20:10 2008 @@ -20,9 +20,9 @@ #include "zypp/Url.h" #include "zypp/media/MediaUserAuth.h" -#include "zypper.h" -#include "zypper-prompt.h" -#include "output/prompt.h" +#include "../Zypper.h" +#include "../prompt.h" +#include "../output/prompt.h" #define REPEAT_LIMIT 3 Copied: trunk/zypper/src/callbacks/repo.h (from r10453, trunk/zypper/src/zypper-repo-callbacks.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/repo.h?p2=t… ============================================================================== --- trunk/zypper/src/zypper-repo-callbacks.h (original) +++ trunk/zypper/src/callbacks/repo.h Tue Jun 24 21:20:10 2008 @@ -18,9 +18,9 @@ #include "zypp/Pathname.h" #include "zypp/Url.h" -#include "zypper.h" -#include "zypper-prompt.h" -#include "zypper-utils.h" +#include "../Zypper.h" +#include "../prompt.h" +#include "../utils.h" /////////////////////////////////////////////////////////////////// namespace ZmartRecipients Copied: trunk/zypper/src/callbacks/rpm.h (from r10453, trunk/zypper/src/zypper-rpm-callbacks.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/rpm.h?p2=tr… ============================================================================== --- trunk/zypper/src/zypper-rpm-callbacks.h (original) +++ trunk/zypper/src/callbacks/rpm.h Tue Jun 24 21:20:10 2008 @@ -21,8 +21,8 @@ #include "zypp/Patch.h" //#include "zypp/target/rpm/RpmCallbacks.h" -#include "zypper.h" -#include "zypper-prompt.h" +#include "../Zypper.h" +#include "../prompt.h" using namespace std; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10454 - /trunk/zypper/src/callbacks/
by jkupec＠svn.opensuse.org 24 Jun '08

24 Jun '08

Author: jkupec Date: Tue Jun 24 21:10:32 2008 New Revision: 10454 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10454&view=rev Log: (empty) Added: trunk/zypper/src/callbacks/ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10453 - /trunk/zypper/doc/TODO
by jkupec＠svn.opensuse.org 24 Jun '08

24 Jun '08

Author: jkupec Date: Tue Jun 24 19:12:34 2008 New Revision: 10453 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10453&view=rev Log: update Modified: trunk/zypper/doc/TODO Modified: trunk/zypper/doc/TODO URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/TODO?rev=10453&r1=104… ============================================================================== --- trunk/zypper/doc/TODO (original) +++ trunk/zypper/doc/TODO Tue Jun 24 19:12:34 2008 @@ -1,7 +1,7 @@ 1.0.x -- bugfixing +- bugfixing for 11.1 -before 1.0.0 +0.12.x - implement all rug commands (where it makes sense) - zypper [help] rug - add help texts for prompts @@ -11,39 +11,27 @@ - clean up/split utils.cc - drop xu command - show recommended and suggested in the summary - -0.11.x -- bugfixing +- report licenses of installed software NOT SCHEDULED ------------- +- - we want it +? - idea + General -- xml input (feed a xml with operation specification to zypper) -- detect whether the terminal we are writing to supports used control sequences - and fall back to OutNoTerminal (make it a child of OutNormal) if not. Usefull - also in cases where the output is redirected to a file or pipe. - DONE in OutNormal, TODO via OutNoTerminal? -- enumerate prompt answers for all prompts -? script progress: does the output contain newline? -- installation and deletion notifications -- testsuite ++ testsuite +? xml input (feed an xml with operation specification to zypper) ? move -vv output to zypper.log, leave only normal and verbose output levels? + -vv e.g. displays full urls of downloaded files Patches -- respect license-to-confirm (test on kernel patch) - (svn up ncurses) -? reboot-needed: ? -- cron updater: wrapper script for restart-packager ++ cron updater: wrapper script for restart-packager after packager-affecting + patches have been installed Packages -- just download, not install. compare to YOU: do not delete after installing - -Cool Stuff - -(document it, brag around) -- zypper in -t language zh_CN ++ just download, don't install. Compare to YOU: do not delete after installing -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10452 - /trunk/dialogsolver/src/resgraphview.cpp
by schubi2＠svn.opensuse.org 24 Jun '08

24 Jun '08

Author: schubi2 Date: Tue Jun 24 16:35:42 2008 New Revision: 10452 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10452&view=rev Log: nicer colours Modified: trunk/dialogsolver/src/resgraphview.cpp Modified: trunk/dialogsolver/src/resgraphview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/resgraphview.cp… ============================================================================== --- trunk/dialogsolver/src/resgraphview.cpp (original) +++ trunk/dialogsolver/src/resgraphview.cpp Tue Jun 24 16:35:42 2008 @@ -343,11 +343,11 @@ return QColor(Qt::green).lighter(190); if (it.data().item->isKind( ResKind::product )) - return Qt::magenta; + return QColor(Qt::magenta).lighter(190); if (it.data().item->isKind( ResKind::pattern )) - return Qt::blue; + return QColor(Qt::blue).lighter(190); if (it.data().item->isKind( ResKind::patch )) - return Qt::yellow; + return QColor(Qt::yellow).lighter(190); return Qt::white; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0