Mailinglist Archive: opensuse-commit (1426 mails)
| < Previous | Next > |
commit yast2-control-center
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sun, 25 Mar 2007 11:49:13 +0200
- Message-id: <20070325094913.BD51B678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-control-center
checked in at Sun Mar 25 11:49:13 CEST 2007.
--------
Old:
----
yast2-control-center-2.14.4.tar.bz2
New:
----
yast2-control-center-2.14.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.M26839/_old 2007-03-25 11:48:57.000000000 +0200
+++ /var/tmp/diff_new_pack.M26839/_new 2007-03-25 11:48:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-control-center (Version 2.14.4)
+# spec file for package yast2-control-center (Version 2.14.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-control-center
-Version: 2.14.4
-Release: 3
+Version: 2.14.5
+Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-control-center-2.14.4.tar.bz2
+Source0: yast2-control-center-2.14.5.tar.bz2
prefix: /usr
BuildRequires: libdrm-devel libjpeg-devel pkgconfig qt3-devel update-desktop-files yast2-devtools
Summary: YaST2 - Control Center
@@ -33,6 +33,7 @@
Summary: YaST2 - Control Center (Qt Version)
Requires: yast2-control-center
Provides: yast2-control-center-binary
+Provides: yast2-control-center:%{prefix}/lib/YaST2/bin/y2controlcenter
Supplements: kdebase3
Group: System/YaST
@@ -43,7 +44,7 @@
%prep
-%setup -n yast2-control-center-2.14.4
+%setup -n yast2-control-center-2.14.5
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-control-center-2.14.4.tar.bz2 -> yast2-control-center-2.14.5.tar.bz2 ++++++
++++ 12842 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-control-center-2.14.4/config.h.in new/yast2-control-center-2.14.5/config.h.in
--- old/yast2-control-center-2.14.4/config.h.in 2007-02-01 17:17:51.000000000 +0100
+++ new/yast2-control-center-2.14.5/config.h.in 2007-03-21 13:28:47.000000000 +0100
@@ -65,7 +65,7 @@
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
+ automatically deduced at runtime.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-control-center-2.14.4/configure.in new/yast2-control-center-2.14.5/configure.in
--- old/yast2-control-center-2.14.4/configure.in 2007-02-01 17:17:19.000000000 +0100
+++ new/yast2-control-center-2.14.5/configure.in 2007-03-21 13:28:32.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-control-center, 2.14.1, http://bugs.opensuse.org/, yast2-control-center)
+AC_INIT(yast2-control-center, 2.14.5, http://bugs.opensuse.org/, yast2-control-center)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.1"
+VERSION="2.14.5"
RPMNAME="yast2-control-center"
MAINTAINER="Stefan Hundhammer <sh@xxxxxxx>"
@@ -143,8 +143,8 @@
AC_PROG_CC
AC_PROG_CPP
-CFLAGS="${CFLAGS} -Wall -Wformat -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} -Wall -Wformat"
+CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
AC_SUBST(AGENT_LIBADD)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-control-center-2.14.4/src/Makefile.am new/yast2-control-center-2.14.5/src/Makefile.am
--- old/yast2-control-center-2.14.4/src/Makefile.am 2007-02-01 15:27:06.000000000 +0100
+++ new/yast2-control-center-2.14.5/src/Makefile.am 2007-03-19 14:22:47.000000000 +0100
@@ -31,6 +31,7 @@
y2controlcenter.cpp \
y2controlcenterview.cpp \
yastmodules.cpp \
+ y2savelogs.cpp \
main.cpp
noinst_HEADERS = \
@@ -44,6 +45,7 @@
y2controlcenter.h \
y2controlcenterview.h \
yastmodules.h \
+ y2savelogs.h \
suseicon.xpm
y2controlcenter_METASOURCES = \
@@ -60,6 +62,7 @@
y2controlcenter.o: y2controlcenter.moc.cpp
y2controlcenterview.o: y2controlcenterview.moc.cpp
yastmodules.o: yastmodules.moc.cpp
+y2savelogs.o: y2savelogs.moc.cpp
process.o: process.moc.cpp
y2cc_iconview.o: y2cc_iconview.moc.cpp
@@ -67,6 +70,7 @@
y2controlcenter.moc.cpp: y2controlcenter.h
y2controlcenterview.moc.cpp: y2controlcenterview.h
yastmodules.moc.cpp: yastmodules.h
+y2savelogs.moc.cpp: y2savelogs.h
process.moc.cpp: process.h
y2cc_iconview.moc.cpp: y2cc_iconview.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-control-center-2.14.4/src/y2controlcenter.cpp new/yast2-control-center-2.14.5/src/y2controlcenter.cpp
--- old/yast2-control-center-2.14.4/src/y2controlcenter.cpp 2007-02-01 15:27:06.000000000 +0100
+++ new/yast2-control-center-2.14.5/src/y2controlcenter.cpp 2007-03-19 16:38:36.000000000 +0100
@@ -11,6 +11,7 @@
*/
#include "y2controlcenter.h"
+#include "y2savelogs.h"
#include <qpopupmenu.h>
@@ -24,10 +25,14 @@
setCentralWidget( _view );
initMenuBar();
+
+ y2LogSaver = new Y2SaveLogs();
+ connect(y2LogSaver, SIGNAL(statusMsg(const QString&)), this, SLOT(slotStatusHelpMsg(const QString&)));
}
Y2ControlCenter::~Y2ControlCenter()
{
+ delete y2LogSaver;
}
@@ -99,13 +104,30 @@
void Y2ControlCenter::slotStatusHelpMsg(const QString &text)
{
- statusBar()->message(text, 4000);
+ statusBar()->message(text, 4000);
+}
+
+bool Y2ControlCenter::eventFilter( QObject *obj, QEvent *ev )
+{
+ if ( ev->type() == QEvent::KeyPress )
+ {
+ QKeyEvent *k = (QKeyEvent*)ev;
+
+ if ( k->key() == Qt::Key_F8 && // Shift-F8: save y2logs
+ k->state() == Qt::ShiftButton )
+ {
+ y2LogSaver->save();
+ return true; // don't process this event any further
+ }
+ }
+
+ return QMainWindow::eventFilter( obj, ev );
}
// override session management
void QApplication::saveState(QSessionManager & sm)
{
- sm.setRestartHint( QSessionManager::RestartNever );
+ sm.setRestartHint( QSessionManager::RestartNever );
}
// override session management
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-control-center-2.14.4/src/y2controlcenter.h new/yast2-control-center-2.14.5/src/y2controlcenter.h
--- old/yast2-control-center-2.14.4/src/y2controlcenter.h 2007-02-01 15:27:06.000000000 +0100
+++ new/yast2-control-center-2.14.5/src/y2controlcenter.h 2007-03-19 14:22:47.000000000 +0100
@@ -33,6 +33,7 @@
// application specific includes
#include "myintl.h"
#include "y2controlcenterview.h"
+#include "y2savelogs.h"
/**
* This Class is the base class for your application. It sets up the main
@@ -64,11 +65,17 @@
void initMenuBar();
void initStatusBar();
+ bool eventFilter( QObject *obj, QEvent *ev );
private:
Y2ControlCenterView * _view;
+ Y2SaveLogs * y2LogSaver;
+ void askSaveLogs();
+ QString askForSaveFileName( const QString & startWith,
+ const QString & filter,
+ const QString & headline );
};
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-control-center-2.14.4/src/y2savelogs.cpp new/yast2-control-center-2.14.5/src/y2savelogs.cpp
--- old/yast2-control-center-2.14.4/src/y2savelogs.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-control-center-2.14.5/src/y2savelogs.cpp 2007-03-19 16:55:19.000000000 +0100
@@ -0,0 +1,179 @@
+/***************************************************************************
+ y2savelogs.cpp - Save YaST Logs
+ author : tgoettlicher@xxxxxxx
+ ***************************************************************************/
+
+/*
+ Textdomain "control-center"
+*/
+
+#include "y2savelogs.h"
+
+#include <qfiledialog.h>
+#include <qmessagebox.h>
+
+
+Y2SaveLogs::Y2SaveLogs()
+{
+ lock = false;
+ proc = 0;
+}
+
+Y2SaveLogs::~Y2SaveLogs()
+{
+}
+
+void Y2SaveLogs::save()
+{
+
+ if (lock)
+ {
+ QMessageBox::warning( 0, // parent
+ "Warning", // caption
+ QString("Logs are written at the moment. Please try again later."),
+ QMessageBox::Ok | QMessageBox::Default, // button0
+ QMessageBox::NoButton, // button1
+ QMessageBox::NoButton ); // button2
+ return;
+ }
+
+ SaveLogs();
+
+}
+
+
+void Y2SaveLogs::saveProcessExited()
+{
+ if ( proc->normalExit() &&
+ proc->exitStatus() == 0 )
+ {
+ emit statusMsg( _("Log files written successfully.") );
+ }
+ else
+ {
+ emit statusMsg( _("Couldn't save y2logs.") );
+ QMessageBox::warning( 0, // parent
+ "Error", // caption
+ QString( "Couldn't save y2logs - "
+ "exit code %1").arg( proc->exitStatus() ),
+ QMessageBox::Ok | QMessageBox::Default, // button0
+ QMessageBox::NoButton, // button1
+ QMessageBox::NoButton ); // button2
+ }
+
+
+ delete proc;
+
+ lock=false;
+
+}
+
+
+void Y2SaveLogs::SaveLogs()
+{
+ QString fileName = askForSaveFileName( "/tmp/y2logs.tgz", // startWith
+ "*.tgz *.tar.gz", // filter
+ "Save y2logs to..." ); // headline
+
+ if ( ! fileName.isEmpty() )
+ {
+ QString saveLogsCommand = "/sbin/save_y2logs";
+
+ if ( access( saveLogsCommand.ascii(), X_OK ) == 0 )
+ {
+ lock = true;
+
+ proc = new QProcess( this );
+ proc->addArgument( saveLogsCommand );
+ proc->addArgument( fileName );
+
+ connect (proc, SIGNAL(processExited()), this, SLOT(saveProcessExited()));
+
+ bool result = proc->start();
+
+ if ( !result )
+ {
+ // unable to start command (errors while running command are handled by saveProcessExited)
+
+ QMessageBox::warning( 0, // parent
+ "Error", // caption
+ QString( "Couldn't save y2logs to %1 - "
+ "exit code %2" ).arg( fileName ).arg( result ),
+ QMessageBox::Ok | QMessageBox::Default, // button0
+ QMessageBox::NoButton, // button1
+ QMessageBox::NoButton ); // button2
+
+ delete proc;
+
+ lock = false;
+ }
+ else
+ {
+ emit statusMsg( _("Writing log files ...") );
+ }
+ }
+ else
+ {
+ QMessageBox::warning( 0, // parent
+ "Error", // caption
+ QString( "Couldn't save y2logs to %1:\n"
+ "Command %2 not found" ).arg( fileName ).arg( saveLogsCommand ),
+ QMessageBox::Ok | QMessageBox::Default, // button0
+ QMessageBox::NoButton, // button1
+ QMessageBox::NoButton ); // button2
+ }
+ }
+}
+
+QString Y2SaveLogs::askForSaveFileName( const QString & startWith,
+ const QString & filter,
+ const QString & headline )
+{
+ QString file_name;
+ bool try_again = false;
+
+ do
+ {
+ // Leave the mouse cursor alone - this function might be called from
+ // some other widget, not only from AskForSaveFileName().
+
+ file_name = QFileDialog::getSaveFileName( startWith,
+ filter,
+ 0, // parent
+ "file_selector", // name
+ headline ); // caption
+
+ if ( file_name.isEmpty() ) // this includes file_name.isNull()
+ return QString::null;
+
+
+ if ( access( (const char *) file_name, F_OK ) == 0 ) // file exists?
+ {
+ QString msg;
+
+ if ( access( (const char *) file_name, W_OK ) == 0 )
+ {
+ // Confirm if the user wishes to overwrite an existing file
+ msg = ( _( "%1 exists! Really overwrite?" ) ).arg( file_name );
+ }
+ else
+ {
+ // Confirm if the user wishes to overwrite a write-protected file %1
+ msg = ( _( "%1 exists and is write-protected!\nReally overwrite?" ) ).arg( file_name );
+ }
+
+ int button_no = QMessageBox::information( 0,
+ // Window title for confirmation dialog
+ _( "Confirm" ),
+ msg,
+ _( "C&ontinue" ),
+ _( "&Cancel" ) );
+ try_again = ( button_no != 0 );
+ }
+
+ } while ( try_again );
+
+ return file_name;
+}
+
+#include <y2savelogs.moc.cpp>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-control-center-2.14.4/src/y2savelogs.h new/yast2-control-center-2.14.5/src/y2savelogs.h
--- old/yast2-control-center-2.14.4/src/y2savelogs.h 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-control-center-2.14.5/src/y2savelogs.h 2007-03-19 16:38:36.000000000 +0100
@@ -0,0 +1,52 @@
+/***************************************************************************
+ y2savelogs.h - Save YaST Logs
+ author : tgoettlicher@xxxxxxx
+ ***************************************************************************/
+
+#ifndef Y2SAVELOGS_H
+#define Y2SAVELOGS_H
+
+// include files for QT
+#include <qstring.h>
+#include <qprocess.h>
+
+
+// application specific includes
+#include "myintl.h"
+
+/**
+ * This Class asks for a filename and saves YaST logfies
+ */
+class Y2SaveLogs : public QObject
+{
+ Q_OBJECT
+
+public:
+
+ Y2SaveLogs();
+ ~Y2SaveLogs();
+
+ void save();
+
+public slots:
+ void saveProcessExited();
+
+
+protected:
+
+signals:
+ void statusMsg( const QString& msg );
+
+private:
+
+ bool lock;
+ QProcess * proc;
+
+ void SaveLogs();
+ QString askForSaveFileName( const QString & startWith,
+ const QString & filter,
+ const QString & headline );
+
+};
+#endif
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-control-center-2.14.4/VERSION new/yast2-control-center-2.14.5/VERSION
--- old/yast2-control-center-2.14.4/VERSION 2007-03-05 17:22:19.000000000 +0100
+++ new/yast2-control-center-2.14.5/VERSION 2007-03-19 14:26:15.000000000 +0100
@@ -1 +1 @@
-2.14.4
+2.14.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |