Merge branch 'feature_mcmod_info' into develop

13 files changed, 712 insertions, 218 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a02a4b27..5503c5ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,6 +215,8 @@ gui/LabeledToolButton.h
 gui/LabeledToolButton.cpp
 gui/EditNotesDialog.h
 gui/EditNotesDialog.cpp
+gui/MCModInfoFrame.h
+gui/MCModInfoFrame.cpp
 
 # Base classes and infrastructure
 logic/BaseVersion.h
@@ -334,6 +336,8 @@ gui/IconPickerDialog.ui
 gui/LegacyModEditDialog.ui
 gui/OneSixModEditDialog.ui
 gui/EditNotesDialog.ui
+
+gui/MCModInfoFrame.ui
 )
 
 set (FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${MULTIMC_SOURCES} ${MULTIMC_UIS})
diff --git a/gui/LegacyModEditDialog.cpp b/gui/LegacyModEditDialog.cpp
index 87647e0f..585bfdfb 100644
--- a/gui/LegacyModEditDialog.cpp
+++ b/gui/LegacyModEditDialog.cpp
@@ -345,34 +345,41 @@ void LegacyModEditDialog::on_buttonBox_rejected()
 	close();
 }
 
-//FIXME: too much copypasta makes peterix a sad hacker. BUT IT'S SO DELICIOUS!
-
-void LegacyModEditDialog::on_coreWebsite_clicked()
+void LegacyModEditDialog::on_jarModsTreeView_pressed(const QModelIndex &index)
 {
 	int first, last;
-	auto list = ui->coreModsTreeView->selectionModel()->selectedRows();
+	auto list = ui->jarModsTreeView->selectionModel()->selectedRows();
 
 	if (!lastfirst(list, first, last))
 		return;
-	showWebsiteForMod(this, m_coremods->operator[](first));
+
+	Mod &m = m_jarmods->operator[](first);
+
+	handleModInfoUpdate(m, ui->jarMIFrame);
 }
 
-void LegacyModEditDialog::on_jarWebsite_clicked()
+void LegacyModEditDialog::on_coreModsTreeView_pressed(const QModelIndex &index)
 {
 	int first, last;
-	auto list = ui->jarModsTreeView->selectionModel()->selectedRows();
+	auto list = ui->coreModsTreeView->selectionModel()->selectedRows();
 
 	if (!lastfirst(list, first, last))
 		return;
-	showWebsiteForMod(this, m_jarmods->operator[](first));
+
+	Mod &m = m_coremods->operator[](first);
+
+	handleModInfoUpdate(m, ui->coreMIFrame);
 }
 
-void LegacyModEditDialog::on_loaderWebsite_clicked()
+void LegacyModEditDialog::on_loaderModTreeView_pressed(const QModelIndex &index)
 {
 	int first, last;
 	auto list = ui->loaderModTreeView->selectionModel()->selectedRows();
 
 	if (!lastfirst(list, first, last))
 		return;
-	showWebsiteForMod(this, m_mods->operator[](first));
+
+	Mod &m = m_mods->operator[](first);
+
+	handleModInfoUpdate(m, ui->loaderMIFrame);
 }
diff --git a/gui/LegacyModEditDialog.h b/gui/LegacyModEditDialog.h
index f12d9a7b..b5d51fd5 100644
--- a/gui/LegacyModEditDialog.h
+++ b/gui/LegacyModEditDialog.h
@@ -53,13 +53,13 @@ slots:
 	void on_rmTexPackBtn_clicked();
 	void on_viewTexPackBtn_clicked();
 
-	void on_jarWebsite_clicked();
-	void on_loaderWebsite_clicked();
-	void on_coreWebsite_clicked();
-
 	// Questionable: SettingsDialog doesn't need this for some reason?
 	void on_buttonBox_rejected();
 
+	void on_jarModsTreeView_pressed(const QModelIndex &index);
+	void on_coreModsTreeView_pressed(const QModelIndex &index);
+	void on_loaderModTreeView_pressed(const QModelIndex &index);
+
 protected:
 	bool eventFilter(QObject *obj, QEvent *ev);
 	bool jarListFilter(QKeyEvent *ev);
diff --git a/gui/LegacyModEditDialog.ui b/gui/LegacyModEditDialog.ui
index 6a4b6d1e..3ab946d9 100644
--- a/gui/LegacyModEditDialog.ui
+++ b/gui/LegacyModEditDialog.ui
@@ -23,197 +23,218 @@
       <attribute name="title">
        <string>Jar Mods</string>
       </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
-        <widget class="ModListView" name="jarModsTreeView">
-         <property name="verticalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
-         <property name="horizontalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOff</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="jarModsButtonBox">
-         <item>
-          <widget class="QPushButton" name="addJarBtn">
-           <property name="text">
-            <string>&amp;Add</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="rmJarBtn">
-           <property name="text">
-            <string>&amp;Remove</string>
-           </property>
-          </widget>
-         </item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
-          <widget class="QPushButton" name="addForgeBtn">
-           <property name="text">
-            <string>MCForge</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="jarWebsite">
-           <property name="text">
-            <string>Website</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="jarModsButtonSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
+          <widget class="ModListView" name="jarModsTreeView">
+           <property name="verticalScrollBarPolicy">
+            <enum>Qt::ScrollBarAlwaysOn</enum>
            </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QPushButton" name="moveJarUpBtn">
-           <property name="text">
-            <string>Move &amp;Up</string>
+           <property name="horizontalScrollBarPolicy">
+            <enum>Qt::ScrollBarAlwaysOff</enum>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="moveJarDownBtn">
-           <property name="text">
-            <string>Move &amp;Down</string>
-           </property>
-          </widget>
+          <layout class="QVBoxLayout" name="jarModsButtonBox">
+           <item>
+            <widget class="QPushButton" name="addJarBtn">
+             <property name="text">
+              <string>&amp;Add</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="rmJarBtn">
+             <property name="text">
+              <string>&amp;Remove</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="addForgeBtn">
+             <property name="text">
+              <string>MCForge</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="jarModsButtonSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QPushButton" name="moveJarUpBtn">
+             <property name="text">
+              <string>Move &amp;Up</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="moveJarDownBtn">
+             <property name="text">
+              <string>Move &amp;Down</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
         </layout>
        </item>
+       <item>
+        <widget class="MCModInfoFrame" name="jarMIFrame">
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="coreTab">
       <attribute name="title">
        <string>Core Mods</string>
       </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
-        <widget class="ModListView" name="coreModsTreeView">
-         <property name="dragDropMode">
-          <enum>QAbstractItemView::DropOnly</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="coreModsButtonBox">
-         <item>
-          <widget class="QPushButton" name="addCoreBtn">
-           <property name="text">
-            <string>&amp;Add</string>
-           </property>
-          </widget>
-         </item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
-          <widget class="QPushButton" name="rmCoreBtn">
-           <property name="text">
-            <string>&amp;Remove</string>
+          <widget class="ModListView" name="coreModsTreeView">
+           <property name="dragDropMode">
+            <enum>QAbstractItemView::DropOnly</enum>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="coreWebsite">
-           <property name="text">
-            <string>Website</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="coreModsButtonSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QPushButton" name="viewCoreBtn">
-           <property name="text">
-            <string>&amp;View Folder</string>
-           </property>
-          </widget>
+          <layout class="QVBoxLayout" name="coreModsButtonBox">
+           <item>
+            <widget class="QPushButton" name="addCoreBtn">
+             <property name="text">
+              <string>&amp;Add</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="rmCoreBtn">
+             <property name="text">
+              <string>&amp;Remove</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="coreModsButtonSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QPushButton" name="viewCoreBtn">
+             <property name="text">
+              <string>&amp;View Folder</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
         </layout>
        </item>
+       <item>
+        <widget class="MCModInfoFrame" name="coreMIFrame">
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="modTab">
       <attribute name="title">
        <string>Loader Mods</string>
       </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="ModListView" name="loaderModTreeView">
-         <property name="acceptDrops">
-          <bool>true</bool>
-         </property>
-         <property name="dragDropMode">
-          <enum>QAbstractItemView::DropOnly</enum>
-         </property>
-        </widget>
-       </item>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
-        <layout class="QVBoxLayout" name="mlModsButtonBox">
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
-          <widget class="QPushButton" name="addModBtn">
-           <property name="text">
-            <string>&amp;Add</string>
+          <widget class="ModListView" name="loaderModTreeView">
+           <property name="acceptDrops">
+            <bool>true</bool>
            </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="rmModBtn">
-           <property name="text">
-            <string>&amp;Remove</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="loaderWebsite">
-           <property name="text">
-            <string>Website</string>
+           <property name="dragDropMode">
+            <enum>QAbstractItemView::DropOnly</enum>
            </property>
           </widget>
          </item>
          <item>
-          <spacer name="mlModsButtonSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QPushButton" name="viewModBtn">
-           <property name="text">
-            <string>&amp;View Folder</string>
-           </property>
-          </widget>
+          <layout class="QVBoxLayout" name="mlModsButtonBox">
+           <item>
+            <widget class="QPushButton" name="addModBtn">
+             <property name="text">
+              <string>&amp;Add</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="rmModBtn">
+             <property name="text">
+              <string>&amp;Remove</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="mlModsButtonSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QPushButton" name="viewModBtn">
+             <property name="text">
+              <string>&amp;View Folder</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
         </layout>
        </item>
+       <item>
+        <widget class="MCModInfoFrame" name="loaderMIFrame">
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="texPackTab">
@@ -291,6 +312,12 @@
    <extends>QTreeView</extends>
    <header>gui/ModListView.h</header>
   </customwidget>
+  <customwidget>
+   <class>MCModInfoFrame</class>
+   <extends>QFrame</extends>
+   <header>gui/MCModInfoFrame.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/gui/MCModInfoFrame.cpp b/gui/MCModInfoFrame.cpp
new file mode 100644
index 00000000..70cfd46a
--- /dev/null
+++ b/gui/MCModInfoFrame.cpp
@@ -0,0 +1,92 @@
+/* Copyright 2013 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "MCModInfoFrame.h"
+#include "ui_MCModInfoFrame.h"
+
+void handleModInfoUpdate(Mod &m, MCModInfoFrame *frame)
+{
+	if(m.type() == m.MOD_FOLDER)
+	{
+		frame->setName("<p><span style=\" font-size:9pt; font-weight:600; font-style:italic;\">Select a mod to view information...</span></p>");
+		frame->setDescription("<p><span style=\" font-style:italic;\">Mod description</span></p>");
+		frame->setAuthors("<p><span style=\" font-style:italic; color:#4a4a4a;\">Mod authors</span></p>");
+		frame->setCredits("<p><span style=\" font-style:italic; color:#4a4a4a;\">Mod credits</span></p>");
+		frame->setWebsite("<p><span style=\" font-style:italic; color:#4a4a4a;\">Mod website</span></p>");
+
+		return;
+	}
+
+	QString missing = "<p><span style=\" font-style:italic; color:#4a4a4a;\">Missing from mcmod.info</span></p>";
+
+	QString name = m.name();
+	if(name.isEmpty()) name = missing;
+	QString description = m.description();
+	if(description.isEmpty()) description = missing;
+	QString authors = m.authors();
+	if(authors.isEmpty()) authors = missing;
+	QString credits = m.credits();
+	if(credits.isEmpty()) credits = missing;
+	QString website = m.homeurl();
+	if(website.isEmpty()) website = missing;
+	else website = "<a href=\"" + website + "\">" + website + "</a>";
+
+	frame->setName("<p><span style=\" font-size:9pt; font-weight:600;\">" + name + "</span></p>");
+	frame->setDescription(description);
+	frame->setAuthors(authors);
+	frame->setCredits(credits);
+	frame->setWebsite(website);
+}
+
+MCModInfoFrame::MCModInfoFrame(QWidget *parent) :
+	QFrame(parent),
+	ui(new Ui::MCModInfoFrame)
+{
+	ui->setupUi(this);
+}
+
+MCModInfoFrame::~MCModInfoFrame()
+{
+	delete ui;
+}
+
+void MCModInfoFrame::setName(QString name)
+{
+	ui->label_Name->setText(name);
+	ui->label_Name->setToolTip(name);
+}
+
+void MCModInfoFrame::setDescription(QString description)
+{
+	ui->label_Description->setText(description);
+	ui->label_Description->setToolTip(description);
+}
+
+void MCModInfoFrame::setAuthors(QString authors)
+{
+	ui->label_Authors->setText(authors);
+	ui->label_Authors->setToolTip(authors);
+}
+
+void MCModInfoFrame::setCredits(QString credits)
+{
+	ui->label_Credits->setText(credits);
+	ui->label_Credits->setToolTip(credits);
+}
+
+void MCModInfoFrame::setWebsite(QString website)
+{
+	ui->label_Website->setText(website);
+}
diff --git a/gui/MCModInfoFrame.h b/gui/MCModInfoFrame.h
new file mode 100644
index 00000000..516fc5ed
--- /dev/null
+++ b/gui/MCModInfoFrame.h
@@ -0,0 +1,44 @@
+/* Copyright 2013 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <QFrame>
+#include "logic/Mod.h"
+
+namespace Ui {
+class MCModInfoFrame;
+}
+
+class MCModInfoFrame : public QFrame
+{
+	Q_OBJECT
+	
+public:
+	explicit MCModInfoFrame(QWidget *parent = 0);
+	~MCModInfoFrame();
+
+	void setName(QString name);
+	void setDescription(QString description);
+	void setAuthors(QString authors);
+	void setCredits(QString credits);
+	void setWebsite(QString website);
+
+	
+private:
+	Ui::MCModInfoFrame *ui;
+};
+
+void handleModInfoUpdate(Mod &m, MCModInfoFrame *frame);
diff --git a/gui/MCModInfoFrame.ui b/gui/MCModInfoFrame.ui
new file mode 100644
index 00000000..73b93a2e
--- /dev/null
+++ b/gui/MCModInfoFrame.ui
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MCModInfoFrame</class>
+ <widget class="QFrame" name="MCModInfoFrame">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>571</width>
+    <height>55</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Frame</string>
+  </property>
+  <property name="frameShape">
+   <enum>QFrame::StyledPanel</enum>
+  </property>
+  <property name="frameShadow">
+   <enum>QFrame::Raised</enum>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QFrame" name="frame_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>250</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_5">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>9</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="label_Name">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>92</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:9pt; font-weight:600; font-style:italic;&quot;&gt;Select a mod to view information...&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="label_Description">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>92</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Mod description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetDefaultConstraint</enum>
+     </property>
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+     </property>
+     <property name="labelAlignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Authors:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLabel" name="label_Authors">
+       <property name="minimumSize">
+        <size>
+         <width>200</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>92</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic; color:#4a4a4a;&quot;&gt;Mod authors&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Website:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLabel" name="label_Website">
+       <property name="minimumSize">
+        <size>
+         <width>200</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>92</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic; color:#4a4a4a;&quot;&gt;Mod website&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+       <property name="openExternalLinks">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="label_Credits">
+       <property name="minimumSize">
+        <size>
+         <width>200</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>92</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic; color:#4a4a4a;&quot;&gt;Mod credits&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Credits:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/gui/ModListView.h b/gui/ModListView.h
index a9408fe7..69a26755 100644
--- a/gui/ModListView.h
+++ b/gui/ModListView.h
@@ -9,4 +9,5 @@ class ModListView: public QTreeView
 public:
 	explicit ModListView ( QWidget* parent = 0 );
 	virtual void setModel ( QAbstractItemModel* model );
-};
\ No newline at end of file
+
+};
diff --git a/gui/OneSixModEditDialog.cpp b/gui/OneSixModEditDialog.cpp
index 788a61d0..9724cec5 100644
--- a/gui/OneSixModEditDialog.cpp
+++ b/gui/OneSixModEditDialog.cpp
@@ -298,12 +298,15 @@ void OneSixModEditDialog::on_viewResPackBtn_clicked()
 	openDirInDefaultProgram(m_inst->resourcePacksDir(), true);
 }
 
-void OneSixModEditDialog::on_loaderWebsite_clicked()
+void OneSixModEditDialog::on_loaderModTreeView_pressed(const QModelIndex &index)
 {
 	int first, last;
 	auto list = ui->loaderModTreeView->selectionModel()->selectedRows();
 
 	if (!lastfirst(list, first, last))
 		return;
-	showWebsiteForMod(this, m_mods->operator[](first));
+
+	Mod &m = m_mods->operator[](first);
+
+	handleModInfoUpdate(m, ui->frame);
 }
diff --git a/gui/OneSixModEditDialog.h b/gui/OneSixModEditDialog.h
index ce4da4fe..03ebf7a3 100644
--- a/gui/OneSixModEditDialog.h
+++ b/gui/OneSixModEditDialog.h
@@ -44,9 +44,11 @@ private slots:
 	void on_forgeBtn_clicked();
 	void on_customizeBtn_clicked();
 	void on_revertBtn_clicked();
-	void on_loaderWebsite_clicked();
     void updateVersionControls();
 	void disableVersionControls();
+
+	void on_loaderModTreeView_pressed(const QModelIndex &index);
+
 protected:
 	bool eventFilter(QObject *obj, QEvent *ev);
 	bool loaderListFilter( QKeyEvent* ev );
diff --git a/gui/OneSixModEditDialog.ui b/gui/OneSixModEditDialog.ui
index b97d4304..675a6faa 100644
--- a/gui/OneSixModEditDialog.ui
+++ b/gui/OneSixModEditDialog.ui
@@ -26,7 +26,7 @@
       </size>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="libTab">
       <attribute name="title">
@@ -157,62 +157,79 @@
       <attribute name="title">
        <string>Loader Mods</string>
       </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <layout class="QVBoxLayout" name="verticalLayout_6">
        <item>
-        <widget class="ModListView" name="loaderModTreeView">
-         <property name="acceptDrops">
-          <bool>true</bool>
-         </property>
-         <property name="dragDropMode">
-          <enum>QAbstractItemView::DropOnly</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
-          <widget class="QPushButton" name="addModBtn">
-           <property name="text">
-            <string>&amp;Add</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="rmModBtn">
-           <property name="text">
-            <string>&amp;Remove</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="loaderWebsite">
-           <property name="text">
-            <string>Website</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <item>
+            <widget class="ModListView" name="loaderModTreeView">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="acceptDrops">
+              <bool>true</bool>
+             </property>
+             <property name="dragDropMode">
+              <enum>QAbstractItemView::DropOnly</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
          <item>
-          <widget class="QPushButton" name="viewModBtn">
-           <property name="text">
-            <string>&amp;View Folder</string>
-           </property>
-          </widget>
+          <layout class="QVBoxLayout" name="verticalLayout_2">
+           <item>
+            <widget class="QPushButton" name="addModBtn">
+             <property name="text">
+              <string>&amp;Add</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="rmModBtn">
+             <property name="text">
+              <string>&amp;Remove</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QPushButton" name="viewModBtn">
+             <property name="text">
+              <string>&amp;View Folder</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
         </layout>
        </item>
+       <item>
+        <widget class="MCModInfoFrame" name="frame">
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="resPackTab">
@@ -290,6 +307,12 @@
    <extends>QTreeView</extends>
    <header>gui/ModListView.h</header>
   </customwidget>
+  <customwidget>
+   <class>MCModInfoFrame</class>
+   <extends>QFrame</extends>
+   <header>gui/MCModInfoFrame.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/logic/Mod.cpp b/logic/Mod.cpp
index 825e663f..c45e3ad2 100644
--- a/logic/Mod.cpp
+++ b/logic/Mod.cpp
@@ -119,6 +119,18 @@ void Mod::ReadMCModInfo(QByteArray contents)
 		m_name = firstObj.value("name").toString();
 		m_version = firstObj.value("version").toString();
 		m_homeurl = firstObj.value("url").toString();
+		m_description = firstObj.value("description").toString();
+		QJsonArray authors = firstObj.value("authors").toArray();
+		if(authors.size() == 0) m_authors = "";
+		else if(authors.size() >= 1)
+		{
+			m_authors = authors.at(0).toString();
+			for(int i = 1; i < authors.size(); i++)
+			{
+				m_authors += ", " + authors.at(i).toString();
+			}
+		}
+		m_credits = firstObj.value("credits").toString();
 		return;
 	}
 	;
diff --git a/logic/Mod.h b/logic/Mod.h
index 9831fdc0..f3aaf18b 100644
--- a/logic/Mod.h
+++ b/logic/Mod.h
@@ -63,6 +63,21 @@ public:
 		return m_homeurl;
 	}
 
+	QString description() const
+	{
+		return m_description;
+	}
+
+	QString authors() const
+	{
+		return m_authors;
+	}
+
+	QString credits() const
+	{
+		return m_credits;
+	}
+
 	// delete all the files of this mod
 	bool destroy();
 	// replace this mod with a copy of the other
@@ -99,6 +114,9 @@ protected:
 	QString m_version;
 	QString m_mcversion;
 	QString m_homeurl;
+	QString m_description;
+	QString m_authors;
+	QString m_credits;
 
 	ModType m_type;
 };