[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kmameleon/main
From:       Primoz Anzur <zerokode () gmx ! net>
Date:       2005-07-15 2:42:06
Message-ID: 1121395326.441074.23044.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 434696 by zero:

Few oopses, created by adding a field in the romlist
Fixed weird bug regarding reloading / refreshing romlist...


 M  +6 -5      kmmgameslist.cc  
 M  +17 -11    mainwindow.cc  


--- trunk/kdenonbeta/kmameleon/main/kmmgameslist.cc #434695:434696
@@ -46,7 +46,6 @@
 	QToolTip::add(btnCfg, i18n("Configure KMameleon"));
 	QToolTip::add(btnStop, i18n("Stop currently running xmame"));
 	//QToolTip::add(btnHelp, i18n("Help"));
-	QToolTip::add(btnReload, i18n("Reload Gamelist"));
 	QToolTip::add(btnTools, i18n("KMameleon tools"));
 	
 	QToolTip::add(btPresents, i18n("Display only found <strong>and</strong> supported games"));
@@ -83,8 +82,9 @@
 	if(!refresh) {
 		// fill games lists
 		fillSupported();
+		fillPresent();
+		verifyRoms ();
 		if (config->readBoolEntry("displayType")) {
-			fillPresent();
 			btPresents->setChecked(true);
 		}
 	} else {
@@ -344,7 +344,7 @@
 	config->writeEntry("displayType",true);
 	config->sync();
 	kdDebug() << "void ItemGamesList::refreshPresents( int )" << endl;
-	//verifyRoms ();
+	verifyRoms ();
 }
 
 void ItemGamesList::refreshSupported( int ) {
@@ -386,7 +386,8 @@
 	splash->show();
 	splash->QWidget::setCursor( QCursor(Qt::WaitCursor) );
 	fillSupported();
-//	fillPresent();
+	fillPresent();
+	verifyRoms ();
 	btSupported->setChecked(true);
 	splash->QWidget::setCursor( QCursor(Qt::ArrowCursor) );
 	splash->hide();
@@ -506,6 +507,7 @@
 }
 
 void ItemGamesList::verifyRoms( ) {
+	config->setGroup("general");
 	QMap<QString, QString> vfMap;
 	
 	QString vFileName (locateLocal("appdata", "verified.roms"));
@@ -528,7 +530,6 @@
 	}
 	else
 	{
-		kdDebug() << "Missing file" << endl;
 		return;
 	}
 
--- trunk/kdenonbeta/kmameleon/main/mainwindow.cc #434695:434696
@@ -226,11 +226,11 @@
 		return;
 	}
 	
-	if(fromGameList) 
-		conf_selectedGame = item->text(0);
-	else
+	if(fromGameList) {
+		conf_selectedGame = item->text(1);
+	} else {
 		conf_selectedGame = lstGames->currentText();
-		
+	}
 	proc.clearArguments();
 	#if KDE_VERSION >= 306
 		proc.setUseShell(true);
@@ -238,10 +238,11 @@
 
 	bool switchCustom;
 	config->setGroup("general");
-	if (config->readBoolEntry("custom", false))
+	if (config->readBoolEntry("custom", false)) {
 		switchCustom = true;
-	else
+	} else {
 		switchCustom = false;
+	}
 	
 	QString romPath( config->readEntry("xmame_rom", "") );
 			
@@ -264,22 +265,27 @@
                         config -> setGroup("general");
 			config -> writeEntry("last_played", conf_selectedGame);
 
-			if (! proc.start(KProcess::NotifyOnExit, KProcess::AllOutput))
+			if (! proc.start(KProcess::NotifyOnExit, KProcess::AllOutput)) {
 				KMessageBox::information( 0, i18n("Couldn't load a program") );
+			}
 
-			if (proc.isRunning())
+			if (proc.isRunning()) {
 				btnStop->setEnabled(true);
+			}
 		}
-		else
+		else {
 			KMessageBox::error( 0, i18n("XMame binary path seems to be missing") );
+		}
 
 		kdDebug() << xmame_type << endl;
 		kdDebug() << conf_xmameBinPath << endl;
 		kdDebug() << options << endl;
 		options="";
 	}
-	else
-		KMessageBox::error( 0, i18n("No rom selected !") );
+	else {
+		
+		KMessageBox::error( 0, i18n("Dumbass !") );
+	}
 }
 
 void KMameleon::runConf()
[prev in list] [next in list] [prev in thread] [next in thread]