Merge pull request #81 from QSanguosha-Rara/dev

0.7.2 merge

changelog.txt

@@ -3,7 +3,7 @@
 
   Change Log / Release Notes
 
-0.7.2 beta
+0.7.2 beta (June 2 2014)
 -----------------------------
   Bugs Fixed:
   +天覆失效
@@ -50,7 +50,7 @@
 
   +升级LUA为5.2.3，依然加入continue，但是删除了module
 
-  +升级Qt基础库至4.8.6
+  +升级Qt基础库至4.8.6(release)/5.3.0(develop)
 
   +在AI延时为0时不显示觉醒动画
 
@@ -81,6 +81,8 @@
   +新增可选规则：首亮奖励
 
   +新增测试功能：检查更新
+
+  +根据最新规则，调整借刀杀人
 
 0.7.1 alpha (April 10 2014)
 -----------------------------

developers/Yanguam.htm

@@ -20,7 +20,7 @@ <h1>YanGuam</h1>
     <br />
     <br />
     <br />
-    <img border="0" src="./image/system/developers/rara.jpg" alt="Yanguam Siliagim" title="Yanguam Siliagim" width=100><br />
+    <img border="0" src="./image/system/developers/rara.png" alt="Yanguam Siliagim" title="Yanguam Siliagim" width=100><br />
     <br />
     <br />
     <br>简介</div>

src/core/engine.cpp

@@ -526,7 +526,7 @@ SkillCard *Engine::cloneSkillCard(const QString &name) const{
 }
 
 QString Engine::getVersionNumber() const{
-    return "0.7.1.9";
+    return "0.7.2";
 }
 
 QString Engine::getVersion() const{

src/dialog/UpdateChecker.cpp

@@ -43,7 +43,7 @@ void UpdateChecker::fill( UpdateInfoStruct info )
 {
     QString state;
     bool lastest = false;
-    if (info.version_number > Sanguosha->getVersionNumber()) {
+    if (info.version_number.toInt() > Sanguosha->getVersionNumber().toInt()) {
         QString postfix = " : " + info.version_number;
         if (info.is_patch)
             state = tr("New Patch Available") + postfix;
@@ -56,7 +56,7 @@ void UpdateChecker::fill( UpdateInfoStruct info )
     state_label->setText(state);
 
     if (lastest)
-        address_label->hide();
+        address_label->setText(tr("Lastest Version Already"));
     else {
         address_label->setOpenExternalLinks(true);
         address_label->setText(QString("<a href='%1' style = \"color:#0072c1; \">%1</a> <br/>").arg(info.address));
@@ -69,7 +69,7 @@ void UpdateChecker::fill( UpdateInfoStruct info )
         QString content = stream.readAll();
         page->setHtml(content);
     } else
-        page->hide();
+        page->setText(tr("Lastest Version Already"));
 }
 
 void UpdateChecker::clear()

src/dialog/mainwindow.cpp

@@ -878,7 +878,7 @@ void MainWindow::storeKeyAndValue( const QString &key, const QString &value )
             update_info.is_patch = false;
 
         update_info.version_number = v;
-        if (Sanguosha->getVersionNumber() < value)
+        if (Sanguosha->getVersionNumber().toInt() < value.toInt())
             setWindowTitle(tr("New Version Available") + "  " + windowTitle());
     } else if ("Address" == key)
         update_info.address = value;

src/main.cpp

@@ -45,7 +45,7 @@ static bool callback(const wchar_t *, const wchar_t *id,
     if (succeeded && QFile::exists("QSanSMTPClient.exe")){
         char *ID = new char[65535];
         memset(ID, 0, sizeof(ID));
-        WideCharToMultiByte(CP_ACP, 0, id, -1, ID, 65535, NULL, FALSE);
+		wcstombs(ID, id, wcslen(id));
         QProcess *process = new QProcess(qApp);
         QStringList args;
         args << QString(ID) + ".dmp";