Skip to content

Commit

Permalink
✔ 添加内置德语,添加下拉框选择
Browse files Browse the repository at this point in the history
✔ 添加德语资源文件
✔ 添加qttabbar图标ico
✔ 添加安装文件在控制面板显示信息
✔ 修正版本号错误
  • Loading branch information
indiff committed Aug 13, 2021
1 parent 6df3b9b commit d2d3d5d
Show file tree
Hide file tree
Showing 21 changed files with 1,117 additions and 574 deletions.
4 changes: 2 additions & 2 deletions BandObjectLib/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
[assembly: AssemblyCopyright("Copyright (C) 2007-2021")]
[assembly: AssemblyTrademark("indiff")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyFileVersion("1.5.5.0")]
[assembly: AssemblyFileVersion("1.5.5.2")]
//
// Version information for an assembly consists of the following four values:
//
Expand All @@ -42,7 +42,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("1.5.5.0")]
[assembly: AssemblyVersion("1.5.5.2")]

//
// In order to sign your assembly you must specify a key to use. Refer to the
Expand Down
16 changes: 13 additions & 3 deletions Installer/Installer.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@

<?define SkuName = "QTTabBar"?>
<?define RTMProductVersion="1.5.0" ?>
<?define ProductVersion="1.5.5.0" ?> <!-- Change the last number to the svn revision before release -->
<?define VersionString="1.5.5(2021)" ?> <!-- Change to correct version before release, eg, 2019 1.5.0.0 Beta 1 -->
<?define ProductVersion="1.5.5.2" ?> <!-- Change the last number to the svn revision before release -->
<?define VersionString="1.5.5.2 Beta(2021)" ?> <!-- Change to correct version before release, eg, 2019 1.5.0.0 Beta 1 -->
<?define UpgradeCode="{ec9baff7-58fb-40cb-9f67-1c438a7524a5}"?> <!-- NEVER CHANGE THIS, EVER!! -->
<!-- Quizo and Paul Accisano -->
<?define Manufacturer="indiff"?>
<?define ProductCode="*"?>
<?define StrongName="QTTabBar, Version=1.5.5.0, Culture=neutral, PublicKeyToken=973461f1cd23d8eb"?>
<?define StrongName="QTTabBar, Version=1.5.5.2, Culture=neutral, PublicKeyToken=973461f1cd23d8eb"?>
<?define MyLanguage="1033"?>
<!-- Language code page 1252 1033
语言 语言-国家 Language Codepage
Expand All @@ -49,6 +49,7 @@ Language="1033"
Description="$(var.SkuName) $(var.VersionString)"
ReadOnly="yes"/>
<Media Id="1" Cabinet="$(var.SkuName).cab" EmbedCab="yes" />
<Icon Id="icon.ico" SourceFile="QTTabBar.ico"/>

<WixVariable Id="WixUILicenseRtf" Value="!(loc.GPL_FILE)" />

Expand All @@ -59,6 +60,15 @@ Language="1033"
<Binary Id="InstallerHelper" SourceFile="..\InstallerHelper\bin\Release\InstallerHelper.dll" />
<PropertyRef Id="NETFRAMEWORK35"/>
<PropertyRef Id="NETFRAMEWORK40CLIENT"/>
<!-- 应用程序的更新通道的 URL。 -->
<Property Id="ARPAUTHORIZEDCDFPREFIX" Value="https://github.com/indiff/qttabbar/releases" />
<!-- 应用程序帮助 URL。 -->
<Property Id="ARPHELPLINK" Value="https://github.com/indiff/qttabbar" />

<!-- 应用程序主页的 URL。 -->
<Property Id="ARPCOMMENTS" Value="https://indiff.github.io/qttabbar/" />
<!-- 应用程序更新信息的 URL。 -->
<Property Id="ARPURLINFOABOUT" Value="https://github.com/indiff/qttabbar" />

<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="CommonAppDataFolder">
Expand Down
Binary file added Installer/QTTabBar.ico
Binary file not shown.
4 changes: 2 additions & 2 deletions QTPluginLib/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
[assembly: AssemblyCopyright("Copyright (C) 2007-2021")]
[assembly: AssemblyTrademark("indiff")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyFileVersion("1.5.5.0")]
[assembly: AssemblyFileVersion("1.5.5.2")]

// ComVisible を false に設定すると、このアセンブリ内の型は COM コンポーネントには
// 参照不可能になります。COM からこのアセンブリ内の型にアクセスする場合は、
Expand All @@ -48,4 +48,4 @@
//
// すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
// 既定値にすることができます:
[assembly: AssemblyVersion("1.5.5.0")]
[assembly: AssemblyVersion("1.5.5.2")]
16 changes: 12 additions & 4 deletions QTTabBar/Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,7 @@ public _Mouse() {
{MouseChord.Ctrl | MouseChord.Middle, BindAction.TearOffCurrent}
};
LinkActions = new Dictionary<MouseChord, BindAction> {
{MouseChord.None, BindAction.ItemsOpenInNewTabNoSel},
{MouseChord.Middle, BindAction.ItemOpenInNewTab},
{MouseChord.Ctrl | MouseChord.Middle, BindAction.ItemOpenInNewWindow}
};
Expand Down Expand Up @@ -744,18 +745,25 @@ public class _Lang {
public int BuiltInLangSelectedIndex { get; set; }
public _Lang() {
UseLangFile = false;
BuiltInLang = "English";
LangFile = "";
PluginLangFiles = new string[0];
// WorkingConfig.lang.BuiltInLangSelectedIndex;
// modify by qwop at http://q.cnblogs.com/q/14857/
// modify by qwop at http://q.cnblogs.com/q/14857/ // en-US
if (System.Globalization.CultureInfo.InstalledUICulture.Name.Equals("zh-CN"))
{
BuiltInLangSelectedIndex = 1;
// Console.WriteLine(System.Globalization.CultureInfo.InstalledUICulture.NativeName);
// BuiltInLangSelectedIndex = 1;
// BuiltInLang = "简体中文";

BuiltInLangSelectedIndex = 2;
BuiltInLang = "German";
} else if (System.Globalization.CultureInfo.InstalledUICulture.Name.Equals("de-DE"))
{
BuiltInLangSelectedIndex = 2;
BuiltInLang = "German";
}
else {
BuiltInLangSelectedIndex = 0;
BuiltInLang = "English";
}

// BuiltInLangSelectedIndex = 0;// English version
Expand Down
Loading

0 comments on commit d2d3d5d

Please sign in to comment.