ezxsysinfo-0.1_a1200.patch

moto Java-linux的网络对时软件的源代码。可解决时间错误问题

diff -Naur sysinfo.e680/detail.cpp sysinfo/detail.cpp
--- sysinfo.e680/detail.cpp	2006-06-27 18:41:04.000000000 -0300
+++ sysinfo/detail.cpp	2007-11-22 20:47:03.000000000 -0200
@@ -25,7 +25,7 @@
 #include <qlayout.h>
 
 #include <zpushbutton.h>
-#include <zglobal.h>
+#include <ZGlobal.h>
 
 Detail::Detail( QWidget* parent,  const char* name, WFlags )
     : ZBaseDialog( parent, name, WStyle_ContextHelp )
diff -Naur sysinfo.e680/dropin/opie2/qtabbar.cpp sysinfo/dropin/opie2/qtabbar.cpp
--- sysinfo.e680/dropin/opie2/qtabbar.cpp	2006-02-23 13:25:00.000000000 -0300
+++ sysinfo/dropin/opie2/qtabbar.cpp	2007-11-22 20:41:08.000000000 -0200
@@ -537,7 +537,7 @@
     if ( backgroundMode() == X11ParentRelative ) {
 	erase();
     } else {
-	if ( !testWState(WState_GlobalBrushOrigin) ) 
+	//if ( !testWState(WState_GlobalBrushOrigin) )     qte238
 	    p.setBrushOrigin( rect().bottomLeft() );
 	p.fillRect( 0, 0, width(), height(),
 		    QBrush( colorGroup().brush( QColorGroup::Background ) ));
diff -Naur sysinfo.e680/dropin/qpe/config.cpp sysinfo/dropin/qpe/config.cpp
--- sysinfo.e680/dropin/qpe/config.cpp	2006-05-02 02:25:50.000000000 -0300
+++ sysinfo/dropin/qpe/config.cpp	2007-11-22 20:37:30.000000000 -0200
@@ -710,7 +710,7 @@
 //	QMessageBox::critical( 0, QObject::tr("Out of Space"),
 //			       QObject::tr("There was a problem creating\nConfiguration Information \nfor this program.\n\nPlease free up some space and\ntry again.") );
 	RES_ICON_Reader ir;
-	ZMessageBox::information( 0, ir.getIcon(RES_ICON_DLG_ERROR), 
+	ZMessageBox::information( 0, ir.getIcon(RES_ICON_DLG_ERROR,true), 
 		QObject::tr("There was a problem creating\nConfiguration Information \nfor this program.\n\nPlease free up some space and\ntry again."), 
 		QObject::tr("Close") );
 	f.close();
diff -Naur sysinfo.e680/dropin/qpe/qpeapplication.cpp sysinfo/dropin/qpe/qpeapplication.cpp
--- sysinfo.e680/dropin/qpe/qpeapplication.cpp	2006-06-05 09:27:38.000000000 -0300
+++ sysinfo/dropin/qpe/qpeapplication.cpp	2007-11-22 20:46:22.000000000 -0200
@@ -32,7 +32,7 @@
 #include <qpe/qpeapplication.h>
 #include <qlayout.h>
 
-#include <zglobal.h>
+#include <ZGlobal.h>
 
 QPEApplication::QPEApplication( int & argc, char **argv, Type t )
         : ZApplication( argc, argv, t )
diff -Naur sysinfo.e680/dropin/qpe/qpeapplication.h sysinfo/dropin/qpe/qpeapplication.h
--- sysinfo.e680/dropin/qpe/qpeapplication.h	2006-06-05 09:27:55.000000000 -0300
+++ sysinfo/dropin/qpe/qpeapplication.h	2007-11-22 20:45:51.000000000 -0200
@@ -25,7 +25,7 @@
 #include "qpeglobal.h"
 
 #include <zbasedialog.h>
-#include <zapplication.h>
+#include <ZApplication.h>
 
 class QPEApplication : public ZApplication
 {
diff -Naur sysinfo.e680/editor.cpp sysinfo/editor.cpp
--- sysinfo.e680/editor.cpp	2006-06-25 12:09:52.000000000 -0300
+++ sysinfo/editor.cpp	2007-11-26 00:15:13.000000000 -0200
@@ -23,11 +23,11 @@
 
     fileBrowser = new FileBrowser( "*", this, "%C27%T240", TRUE);
     fileBrowser->setFrameStyle( QFrame::NoFrame );
-    fileBrowser->setDir("/diska");
+    fileBrowser->setDir("/mmc/mmca1");
 
     vb->addWidget( fileBrowser );
 }
 
 Editor::~Editor()
 {
-}
\ No newline at end of file
+}
diff -Naur sysinfo.e680/filebrowser.cpp sysinfo/filebrowser.cpp
--- sysinfo.e680/filebrowser.cpp	2006-06-27 16:32:54.000000000 -0300
+++ sysinfo/filebrowser.cpp	2007-11-26 00:18:06.000000000 -0200
@@ -15,7 +15,7 @@
 #include "filebrowser.h"
 
 // ezx
-#include <zglobal.h>
+#include <ZGlobal.h>
 #include <ezxres.h>
 
 // qt
@@ -85,9 +85,9 @@
 {
     isDialog = dialog;
     RES_ICON_Reader ir;    
-    dirpix = ir.getIcon("FMMS_Personal_Folder_S.g");
-    filpix = ir.getIcon("FMMS_Personal_File_S.g");
-    mmcpix = ir.getIcon("FMMS_Personal_MMC_SD.g");
+    dirpix = ir.getIcon("FMMS_Personal_Folder_S.g",true);
+    filpix = ir.getIcon("FMMS_Personal_File_S.g",true);
+    mmcpix = ir.getIcon("FMMS_Personal_MMC_SD.g",true);
 
     nameFilter = filter;
     setVariableHeight(TRUE);
@@ -121,7 +121,7 @@
     while (it != entries.end()) {
         if (*it != ".") {
             if (*it == "mmca1" || *it == "ezxlocal") {
-                setDir("/diska");
+                setDir("/ezxlocal/download/mystuff");
                 return;
             }
             if (QFileInfo(path + "/" + *it).isDir()) { 
@@ -139,8 +139,10 @@
 
     basePath = dir.canonicalPath();
 
-    if (basePath == "/diska") {
+    if (basePath == "/ezxlocal/download/mystuff") {
         if (text(0) == "..") removeItem(0);
+        item = new FileBrowserItem(this, dirpix, "/ezx_user", TRUE, isDialog);
+        insertItem(item);
         item = new FileBrowserItem(this, dirpix, "/ezxlocal", TRUE, isDialog);
         insertItem(item);
         item = new FileBrowserItem(this, mmcpix, "SD/MMC", TRUE, isDialog);
@@ -166,10 +168,12 @@
     QString path = basePath + "/" + text(index);
     if (QFileInfo(path).isDir())
         setDir(path);
-    if (basePath == "/diska" && text(index) == "SD/MMC")
+    if (basePath == "/ezxlocal/download/mystuff" && text(index) == "SD/MMC")
         setDir("/mmc/mmca1");
-    if (basePath == "/diska" && text(index) == "/ezxlocal")
+    if (basePath == "/ezxlocal/download/mystuff" && text(index) == "/ezxlocal")
         setDir("/ezxlocal");
+    if (basePath == "/ezxlocal/download/mystuff" && text(index) == "/ezx_user")
+        setDir("/ezx_user");
 }
     
 void FileBrowser::itemClicked(QListBoxItem *item)
diff -Naur sysinfo.e680/modulesinfo.cpp sysinfo/modulesinfo.cpp
--- sysinfo.e680/modulesinfo.cpp	2006-06-27 16:11:02.000000000 -0300
+++ sysinfo/modulesinfo.cpp	2007-11-22 20:50:33.000000000 -0200
@@ -161,7 +161,7 @@
     // if ( QMessageBox::warning( this, modname, capstr,
     //                            QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
     RES_ICON_Reader ir;
-    if ( ZMessageBox::information(0, ir.getIcon("Dialog_Question_Mark.g"), capstr, tr("Yes"), tr("No")) == 0 ) 
+    if ( ZMessageBox::information(0, ir.getIcon("Dialog_Question_Mark.g",true), capstr, tr("Yes"), tr("No")) == 0 ) 
     {
         QString command = "/sbin/";
         command.append( CommandCB->currentText() );
diff -Naur sysinfo.e680/processinfo.cpp sysinfo/processinfo.cpp
--- sysinfo.e680/processinfo.cpp	2006-06-27 16:11:18.000000000 -0300
+++ sysinfo/processinfo.cpp	2007-11-22 20:43:25.000000000 -0200
@@ -183,7 +183,7 @@
     // if ( QMessageBox::warning( this, currprocess->text( 1 ), capstr,
     //                            QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
     RES_ICON_Reader ir;
-    if ( ZMessageBox::information(0, ir.getIcon("Dialog_Question_Mark.g"), capstr, tr("Yes"), tr("No")) == 0 ) 
+    if ( ZMessageBox::information(0, ir.getIcon("Dialog_Question_Mark.g",true), capstr, tr("Yes"), tr("No")) == 0 ) 
     {
         currprocess = static_cast<OListViewItem*>( ProcessView->currentItem() );
         if ( currprocess )
diff -Naur sysinfo.e680/sysinfo.cpp sysinfo/sysinfo.cpp
--- sysinfo.e680/sysinfo.cpp	2007-01-21 07:31:23.000000000 -0200
+++ sysinfo/sysinfo.cpp	2007-11-22 20:51:42.000000000 -0200
@@ -91,7 +91,7 @@
     contentBox->setFixedSize( ZGlobal::getSubContentR().size() );
     setContentWidget( contentBox );
 
-    QFrame *cstWidget = (QFrame*)getCSTWidget();
+    QFrame *cstWidget = (QFrame*)getCSTWidget(true);
     
     UTIL_PushButton *cstButton = new UTIL_PushButton( "CST_Menu", cstWidget, -1, -1, -1 );
     cstButton->setGeometry( ZGlobal::mapFromGlobalR(cstButton, ZGlobal::getCst3_1R()) );
diff -Naur sysinfo.e680/sysinfo.h sysinfo/sysinfo.h
--- sysinfo.e680/sysinfo.h	2006-06-27 19:09:11.000000000 -0300
+++ sysinfo/sysinfo.h	2007-11-22 20:50:00.000000000 -0200
@@ -23,7 +23,7 @@
 **********************************************************************/
 
 // #include <qwidget.h>
-#include <zmainwidget.h>
+#include <ZMainWidget.h>
 
 class OTabWidget;
 class QLabel;
diff -Naur sysinfo.e680/sysinfo.pro sysinfo/sysinfo.pro
--- sysinfo.e680/sysinfo.pro	2006-06-25 11:08:55.000000000 -0300
+++ sysinfo/sysinfo.pro	2007-11-22 20:56:55.000000000 -0200
@@ -57,7 +57,7 @@
 
 INCLUDEPATH += $(EZXDIR)/include dropin
 DEPENDPATH  += $(EZXDIR)/include dropin
-LIBS        += -L${EZXDIR}/lib -lezxappbase-xscale-r
+LIBS        += -L${EZXDIR}/lib -lezxappbase
 DEFINES     += UNIX
 TARGET      = sysinfo
 VERSION     = 1.2.2
diff -Naur sysinfo.e680/themeinfo.cpp sysinfo/themeinfo.cpp
--- sysinfo.e680/themeinfo.cpp	2007-01-21 07:26:47.000000000 -0200
+++ sysinfo/themeinfo.cpp	2007-11-26 00:06:36.000000000 -0200
@@ -109,7 +109,7 @@
 
 void ThemeInfo::checkThemeList()
 {
-    QString zt = getThemeName( "/ezxlocal/download/appwrite/setup/ezx_theme.cfg" );
+    QString zt = getThemeName( "/ezx_user/download/appwrite/setup/ezx_theme.cfg" );
     int count = themeList->count();
     for ( int i=0; i<count; i++ ) {
         QListBoxItem *item = themeList->item(i);
@@ -126,7 +126,7 @@
 
 void ThemeInfo::updateThemeList()
 {
-    QString fn = "/ezxlocal/download/appwrite/setup";
+    QString fn = "/ezx_user/download/appwrite/setup";
     QDir dir( fn, "*.phm;*.dhm" );
     QStringList list = dir.entryList( QDir::NoSymLinks | QDir::Files );
     int count = list.count();
@@ -160,7 +160,7 @@
       m.insertItem( tr( "Power Up Animation" ), this, SLOT( slotMovieUp() ));
       m.insertItem( tr( "Power Down Animation" ), this, SLOT( slotMovieDown() ));
       m.insertSeparator(-1);
-      m.insertItem( tr( "Edit Theme" ), this, SLOT( editTheme() ));
+//      m.insertItem( tr( "Edit Theme" ), this, SLOT( editTheme() ));
       m.exec( QCursor::pos() );
    }
       break;
@@ -239,6 +239,6 @@
 
 void ThemeInfo::switchTheme()
 {
-    qWarning("ThemeInfo::switchTheme()");
+//    qWarning("ThemeInfo::switchTheme()");
     // ZSkin::reloadSkin();
 }
diff -Naur sysinfo.e680/usbmode.cpp sysinfo/usbmode.cpp
--- sysinfo.e680/usbmode.cpp	2006-06-27 16:32:28.000000000 -0300
+++ sysinfo/usbmode.cpp	2007-11-25 23:48:49.000000000 -0200
@@ -27,7 +27,7 @@
 
 #include <qapplication.h>
 #include <qtableview.h>
-#include <zmainwidget.h>
+#include <ZMainWidget.h>
 #include <qpushbutton.h>
 #include <qvbox.h>
 #include <zpushbutton.h>
@@ -230,7 +230,7 @@
 				status.append(md);
 			}
 
-			if (!strcmp(m_ents[i].me_proc_name,"MotNet")) {
+			if (cable && !strcmp(m_ents[i].me_proc_name,"MotNet")) {
 				QString ipa;
 				ipa.sprintf("\nIP: %s", buf);
 				status.append(ipa);
@@ -262,7 +262,7 @@
 {
 	RES_ICON_Reader ir;
 	ZMessageBox::information(this,
-			 ir.getIcon(RES_ICON_DLG_COMPLETE),
+			 ir.getIcon(RES_ICON_DLG_COMPLETE,true),
 			 QString("USB Mode for A780\n"
 				 "Version " APP_VERSION "\n"
 				 "by samr7 of MotorolaFans.com"),
diff -Naur sysinfo.e680/versioninfo.cpp sysinfo/versioninfo.cpp
--- sysinfo.e680/versioninfo.cpp	2006-06-25 09:14:57.000000000 -0300
+++ sysinfo/versioninfo.cpp	2007-12-01 19:33:16.000000000 -0200
@@ -17,7 +17,7 @@
 ** not clear to you.
 **
 **********************************************************************/
-
+#include <unistd.h>
 #include "versioninfo.h"
 
 /* OPIE */
@@ -90,9 +90,9 @@
         }
     }
 
-    if ( QFile::exists( "/etc/ap_version.txt" ) )
+    if ( QFile::exists( "/tmp/VersionInfo" ) )
     {
-        QFile bp( "/tmp/VersionInfo" );
+/*        QFile bp( "/tmp/VersionInfo" );
         if ( bp.open( IO_ReadOnly ) )
         {
             QTextStream bs( &bp );
@@ -106,6 +106,28 @@
             firmwareString.append( bs.read() );
             bp.close();
         }
+	*/
+        QFile bp( "/tmp/VersionInfo" );
+	char buf[50];
+        if ( bp.open( IO_ReadOnly ) )
+        {
+            firmwareString.append( tr( "<br>BP: " ) );
+	    bp.readBlock(buf,48);
+            firmwareString.append( buf );
+
+            firmwareString.append( tr( "<br>BPFlex: " ) );
+	    bp.readBlock(buf,48);
+            firmwareString.append( buf );
+
+            firmwareString.append( tr( "<br>DSP: " ) );
+	    bp.readBlock(buf,48);
+            firmwareString.append( buf );
+
+            firmwareString.append( tr( "<br>Technology: " ) );
+	    bp.readBlock(buf,48);
+            firmwareString.append( buf );
+            bp.close();
+        }
     }
 
     firmwareString.append("</qt>");