restored icons

git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@451 05730e5d-ab1b-0410-a4ac-84af385074fa

src/mumble/ASIOInput.cpp

@@ -438,7 +438,7 @@ QString ASIOConfig::title() const {
 }
 
 QIcon ASIOConfig::icon() const {
-	return QIcon(":/icons/config_asio.png");
+	return QIcon(":/config_asio.png");
 }
 
 void ASIOConfig::accept() {

src/mumble/AudioConfigDialog.cpp

@@ -322,7 +322,7 @@ QString AudioConfigDialog::title() const {
 }
 
 QIcon AudioConfigDialog::icon() const {
-	return QIcon(":/icons/config_basic.png");
+	return QIcon(":/config_basic.png");
 }
 
 void AudioConfigDialog::accept() {

src/mumble/DXConfigDialog.cpp

@@ -227,7 +227,7 @@ QString DXConfigDialog::title() const {
 }
 
 QIcon DXConfigDialog::icon() const {
-	return QIcon(":/icons/config_dsound.png");
+	return QIcon(":/config_dsound.png");
 }
 
 void DXConfigDialog::accept() {

src/mumble/GlobalShortcut_unix.cpp

@@ -157,7 +157,7 @@ QString GlobalShortcutXConfig::title() const {
 }
 
 QIcon GlobalShortcutXConfig::icon() const {
-        return QIcon(":/icons/config_shortcuts.png");
+        return QIcon(":/config_shortcuts.png");
 }
 
 void GlobalShortcutXConfig::accept() {

src/mumble/GlobalShortcut_win.cpp

@@ -170,7 +170,7 @@ QString GlobalShortcutWinConfig::title() const {
 }
 
 QIcon GlobalShortcutWinConfig::icon() const {
-	return QIcon(":/icons/config_shortcuts.png");
+	return QIcon(":/config_shortcuts.png");
 }
 
 void GlobalShortcutWinConfig::accept() {

src/mumble/Log.cpp

@@ -114,7 +114,7 @@ QString LogConfig::title() const {
 }
 
 QIcon LogConfig::icon() const {
-	return QIcon(":/icons/config_msgs.png");
+	return QIcon(":/config_msgs.png");
 }
 
 void LogConfig::accept() {

src/mumble/LookConfig.cpp

@@ -128,7 +128,7 @@ QString LookConfig::title() const {
 }
 
 QIcon LookConfig::icon() const {
-	return QIcon(":/icons/config_ui.png");
+	return QIcon(":/config_ui.png");
 }
 
 void LookConfig::accept() {

src/mumble/Overlay_win.cpp

@@ -324,7 +324,7 @@ QString OverlayConfig::title() const {
 }
 
 QIcon OverlayConfig::icon() const {
-	return QIcon(":/icons/config_osd.png");
+	return QIcon(":/config_osd.png");
 }
 
 void OverlayConfig::accept() {

src/mumble/PlayerModel.cpp

@@ -163,17 +163,17 @@ void ModelItem::insertPlayer(Player *p) {
 }
 
 PlayerModel::PlayerModel(QObject *p) : QAbstractItemModel(p) {
-	qiTalkingOn=QIcon(":/icons/talking_on.png");
-	qiTalkingAlt=QIcon(":/icons/talking_alt.png");
-	qiTalkingOff=QIcon(":/icons/talking_off.png");
-	qiMutedSelf=QIcon(":/icons/muted_self.png");
-	qiMutedServer=QIcon(":/icons/muted_server.png");
-	qiMutedLocal=QIcon(":/icons/muted_local.png");
-	qiDeafenedSelf=QIcon(":/icons/deafened_self.png");
-	qiDeafenedServer=QIcon(":/icons/deafened_server.png");
-	qiAuthenticated=QIcon(":/icons/authenticated.png");
-	qiChannel=QIcon(":/icons/channel.png");
-	qiLinkedChannel=QIcon(":/icons/channel_linked.png");
+	qiTalkingOn=QIcon(":/talking_on.png");
+	qiTalkingAlt=QIcon(":/talking_alt.png");
+	qiTalkingOff=QIcon(":/talking_off.png");
+	qiMutedSelf=QIcon(":/muted_self.png");
+	qiMutedServer=QIcon(":/muted_server.png");
+	qiMutedLocal=QIcon(":/muted_local.png");
+	qiDeafenedSelf=QIcon(":/deafened_self.png");
+	qiDeafenedServer=QIcon(":/deafened_server.png");
+	qiAuthenticated=QIcon(":/authenticated.png");
+	qiChannel=QIcon(":/channel.png");
+	qiLinkedChannel=QIcon(":/channel_linked.png");
 
 	miRoot = new ModelItem(Channel::get(0));
 }
@@ -376,18 +376,18 @@ QVariant PlayerModel::otherRoles(int section, int role, bool isPlayer) const
 					if (isPlayer)
  						return tr("This is a player connected to the server. The icon to the left of the player indicates "
 							"whether or not they are talking:<br />"
-							"<img src=\":/icons/talking_on.png\" /> Talking<br />"
-							"<img src=\":/icons/talking_off.png\" /> Not talking"
+							"<img src=\":/talking_on.png\" /> Talking<br />"
+							"<img src=\":/talking_off.png\" /> Not talking"
 							);
 					else
 						return tr("This is a channel on the server. Only players in the same channel can hear each other.");
 				case 1:
 					return tr("This shows the flags the player has on the server, if any:<br />"
-								"<img src=\":/icons/authenticated.png\" />Authenticated user<br />"
-								"<img src=\":/icons/muted_self.png\" />Muted (by self)<br />"
-								"<img src=\":/icons/muted_server.png\" />Muted (by admin)<br />"
-								"<img src=\":/icons/deafened_self.png\" />Deafened (by self)<br />"
-								"<img src=\":/icons/deafened_server.png\" />Deafened (by admin)<br />"
+								"<img src=\":/authenticated.png\" />Authenticated user<br />"
+								"<img src=\":/muted_self.png\" />Muted (by self)<br />"
+								"<img src=\":/muted_server.png\" />Muted (by admin)<br />"
+								"<img src=\":/deafened_self.png\" />Deafened (by self)<br />"
+								"<img src=\":/deafened_server.png\" />Deafened (by admin)<br />"
 								"A player muted by himself is probably just away, talking on the phone or something like that.<br />"
 								"A player muted by an admin is probably also just away, and the noise the player is making was annoying "
 								"enough that an admin muted him.");

src/mumble/Plugins.cpp

@@ -115,7 +115,7 @@ QString PluginConfig::title() const {
 }
 
 QIcon PluginConfig::icon() const {
-	return QIcon(":/icons/config_plugin.png");
+	return QIcon(":/config_plugin.png");
 }
 
 void PluginConfig::accept() {

src/mumble/main.cpp

@@ -98,9 +98,9 @@ int main(int argc, char **argv)
 
 	// Set application icon
 	QIcon icon;
-	icon.addFile(":/icons/mumble.png.2");
-	icon.addFile(":/icons/mumble.png.1");
-	icon.addFile(":/icons/mumble.png.0");
+	icon.addFile(":/mumble.png.2");
+	icon.addFile(":/mumble.png.1");
+	icon.addFile(":/mumble.png.0");
 	a.setWindowIcon(icon);
 
 	// Load preferences