瀏覽代碼

*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/ditto-cp/code/trunk@352 595ec19a-5cb4-439b-94a8-42fb3063c22c
sabrogden 19 年之前
父節點
當前提交
fc6b9cd838
共有 4 個文件被更改,包括 20 次插入3 次删除
  1. 二進制
      DittoSetup/U3/7za.exe
  2. 1 1
      DittoSetup/U3/GenSettings.xml
  3. 17 0
      DittoSetup/U3/UpdateFiles.bat
  4. 2 2
      RulerRichEditCtrl/RulerRichEditCtrl.cpp

二進制
DittoSetup/U3/7za.exe


+ 1 - 1
DittoSetup/U3/GenSettings.xml

@@ -1 +1 @@
-<PackageInstallerGenerator version="1, 0, 0, 8"><installer sourceFile="C:\Documents and Settings\Brogdens\Desktop\Ditto_3\U3\Ditto.u3p" targetPath="C:\Documents and Settings\Brogdens\Desktop\Ditto_3\U3" targetFile="Ditto_3_10_U3.exe"><displayName>Ditto</displayName><version>5.10.0.0</version><iconPath/><i18n><location lcid="1031"><displayName/></location><location lcid="3082"><displayName/></location><location lcid="1036"><displayName/></location><location lcid="1040"><displayName/></location><location lcid="1041"><displayName/></location><location lcid="2052"><displayName/></location></i18n></installer></PackageInstallerGenerator>
+<PackageInstallerGenerator version="1, 0, 0, 8"><installer sourceFile="C:\Documents and Settings\Brogdens\Desktop\ditto\DittoSetup\U3\Ditto.u3p" targetPath="C:\Documents and Settings\Brogdens\Desktop\ditto\DittoSetup\U3" targetFile="Ditto_3_11_U3.exe"><displayName>Ditto</displayName><version>3.11.0.0</version><iconPath/><i18n><location lcid="1031"><displayName/></location><location lcid="3082"><displayName/></location><location lcid="1036"><displayName/></location><location lcid="1040"><displayName/></location><location lcid="1041"><displayName/></location><location lcid="2052"><displayName/></location></i18n></installer></PackageInstallerGenerator>

+ 17 - 0
DittoSetup/U3/UpdateFiles.bat

@@ -0,0 +1,17 @@
+del Device\Help\* /q
+del Device\language\* /q
+
+copy ..\..\Release\DittoU.exe Device\Ditto.exe
+copy ..\..\Release\sqlite3.dll Device\sqlite3.dll
+copy ..\..\Help\*.htm Device\Help\
+copy ..\..\Debug\language\*.xml Device\language\
+
+del Ditto.u3p
+
+7za.exe a -tzip Ditto.u3p "device\*.*" -r -x!Entries.*
+7za.exe a -tzip Ditto.u3p "host\*.*" -r -x!Entries.*
+7za.exe a -tzip Ditto.u3p "manifest\*.*" -r -x!Entries.*
+
+u3p2exe.exe
+
+

+ 2 - 2
RulerRichEditCtrl/RulerRichEditCtrl.cpp

@@ -1485,9 +1485,9 @@ void CRulerRichEditCtrl::DoFont()
 		}
 
 		m_rtf.SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf);
-	}
 
-	m_rtf.SetFocus();
+		m_rtf.SetFocus();
+	}
 }
 
 void CRulerRichEditCtrl::SetCurrentFontName( const CString& font )