Skip to content

Commit

Permalink
✈✈✈✈😜
Browse files Browse the repository at this point in the history 
======= 1.5.3 Beta 2 =======
Bugs Fixed:
	修复了一些已知的bug。

New Features:
	增加自定义按钮图片，支持按钮换肤功能
	添加新功能，支持新开标签页，默认取剪贴板的路径
	调整异常日志打印
	安装包调整汉化
	默认配置项优化调整
	增加支持视频预览图片功能
  • Loading branch information
谭元吉 committed Sep 7, 2020
1 parent f661cb3 commit a606a78
Show file tree
Hide file tree
Showing 17 changed files with 6,225 additions and 5,187 deletions.
4 changes: 2 additions & 2 deletions BandObjectLib/BandObject.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public virtual void SetSite(object pUnkSite) {
Explorer = (WebBrowserClass)Marshal.CreateWrapperOfType(obj2 as IWebBrowser, typeof(WebBrowserClass));
OnExplorerAttached();
}
catch(COMException exception) {
catch(COMException ) { // exception
// QTUtility2.MakeErrorLog(exception, "MSG:" + exception.Message);
}
}
Expand All @@ -268,7 +268,7 @@ public virtual void SetSite(object pUnkSite) {
window.GetWindow(out ReBarHandle);
}
}
catch (Exception exc)
catch (Exception ) // exc
{
// logger.Log(exc);
}
Expand Down
16 changes: 15 additions & 1 deletion CHANGES.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
======= 1.5.2.x Beta 1 =======
======= 1.5.3 Beta 2 =======
Bugs Fixed:
�޸���һЩ��֪��bug��

New Features:
�����Զ��尴ťͼƬ��֧�ְ�ť��������
�����¹��ܣ�֧���¿���ǩҳ��Ĭ��ȡ�������·��
�����쳣��־��ӡ
��װ����������
Ĭ���������Ż�����
����֧����ƵԤ��ͼƬ����
======= 1.5.2.x Beta 2 =======
Todos:
��ǩ���Ҳ��������ť�ܷ�����һ��ѡ���Կ����Ƿ�ȥ���ء� #28
��ť�Զ���ͼƬ������Ч #29
Expand All @@ -7,6 +18,9 @@ Bugs Fixed:
fix bug ������Ч GetTextSize qtabitem.cs(331)��

New Features:
���ӵ���Ƥ��
(Ĭ�����ùرհ�ť��ʾ)��ǩ���Ҳ��������ť�ܷ�����һ��ѡ���Կ����Ƿ�ȥ���ء�#28
�����Զ���ͼƬ #29

======= 1.5.2.0 Beta 2 =======
Bugs Fixed:
Expand Down
1,108 changes: 838 additions & 270 deletions Installer/GPL3_zh_CN.rtf
View file

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions Installer/Installer.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

<?define SkuName = "QTTabBar"?>
<?define RTMProductVersion="1.5.0" ?>
<?define ProductVersion="1.5.2" ?> <!-- Change the last number to the svn revision before release -->
<?define VersionString="1.5.2(2020)" ?> <!-- Change to correct version before release, eg, 2019 1.5.0.0 Beta 1 -->
<?define ProductVersion="1.5.3" ?> <!-- Change the last number to the svn revision before release -->
<?define VersionString="1.5.3(2020)" ?> <!-- 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"?>
Expand Down Expand Up @@ -151,13 +151,13 @@ Language="1033"
<?define compDesc = QTTabBar?>
<?elseif $(var.compName) = QTButtonBar?>
<?define compGUID = {D2BF470E-ED1C-487F-A666-2BD8835EB6CE}?>
<?define compDesc = QTTab Standard Buttons?>
<?define compDesc = !(loc.STANDARD_BUTTONS)?>
<?elseif $(var.compName) = QTCoTaskBarClass?>
<?define compGUID = {D2BF470E-ED1C-487F-A555-2BD8835EB6CE}?>
<?define compDesc = QTTab Desktop Tool?>
<?define compDesc = !(loc.DESKTOP_TOOL)?>
<?elseif $(var.compName) = AutoLoader?>
<?define compGUID = {D2BF470E-ED1C-487F-A777-2BD8835EB6CE}?>
<?define compDesc = QTTabBar AutoLoader?>
<?define compDesc = !(loc.QTTABBAR_ATUOLOADER)?>
<?endif?>
<Component Id="$(var.compName)_$(var.arch)" Win64="$(var.win64)" DisableRegistryReflection="$(var.win64)">
<?if $(var.compName) = QTCoTaskBarClass?>
Expand Down Expand Up @@ -226,16 +226,16 @@ Language="1033"
<?endforeach?>
</Feature>

<CustomAction Id="PreventDowngrading" Error="Newer version already installed." />
<CustomAction Id="PreventDowngrading" Error="!(loc.ALREADY_INSTALLED)" />
<CustomAction Id="HideBars" BinaryKey="InstallerHelper" DllEntry="HideBars" />
<CustomAction Id="CloseAndReopen" BinaryKey="InstallerHelper" DllEntry="CloseAndReopen" />
<CustomAction Id="CheckOldVersion" BinaryKey="InstallerHelper" DllEntry="CheckOldVersion" />
<CustomAction Id="FailOldVersion1" Error="Setup has detected that an older version of QTTabBar is installed. Due to a change in installers, you must manually uninstall this older version and restart Explorer before continuing. Please run the installer again once the older version is uninstalled and Explorer has been restarted." />
<CustomAction Id="FailOldVersion2" Error="It appears that an older version of QTTabBar is still loaded in Windows Explorer. Please restart Explorer via the Task Manager or restart your computer before continuing." />
<CustomAction Id="FailOldVersion1" Error="!(loc.DETECTED_OLD_VERSION)" />
<CustomAction Id="FailOldVersion2" Error="!(loc.STILL_OLD_VERSION)" />
<CustomAction Id="SetRuntime4" Property="RUNTIMEVERSION" Value="v4.0.30319" />
<CustomAction Id="SetRuntimeNot4" Property="RUNTIMEVERSION" Value="v2.0.50727" />

<Condition Message="This application requires the .NET Framework version at least 3.5. Please install the .NET Framework then run this installer again.">
<Condition Message="!(loc.REQUIRE_NET_FRAMEWORK)">
<![CDATA[Installed OR NETFRAMEWORK35 OR NETFRAMEWORK40CLIENT]]>
</Condition>

Expand Down
26 changes: 17 additions & 9 deletions Installer/lang.wxl
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="YOURLOCID">Your localized string</String>
<String Id="READ_INFO">Please read the following information.</String>
<String Id="CLOSE_TABS">Close all Explorer windows and reopen them as tabs</String>
<String Id="COMPILE_IMG">Compiling native images</String>
<String Id="GPL_FILE">GPL3.rtf</String>

</WixLocalization>
<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="YOURLOCID">Your localized string</String>
<String Id="READ_INFO">Please read the following information.</String>
<String Id="CLOSE_TABS">Close all Explorer windows and reopen them as tabs</String>
<String Id="COMPILE_IMG">Compiling native images</String>
<String Id="GPL_FILE">GPL3.rtf</String>
<String Id="STANDARD_BUTTONS">QTTab Standard Buttons</String>
<String Id="DESKTOP_TOOL">QTTab Desktop Tool</String>

<String Id="QTTABBAR_ATUOLOADER">QTTabBar AutoLoader</String>

<String Id="ALREADY_INSTALLED">Newer version already installed.</String>
<String Id="DETECTED_OLD_VERSION">Setup has detected that an older version of QTTabBar is installed. Due to a change in installers, you must manually uninstall this older version and restart Explorer before continuing. Please run the installer again once the older version is uninstalled and Explorer has been restarted.</String>
<String Id="STILL_OLD_VERSION">It appears that an older version of QTTabBar is still loaded in Windows Explorer. Please restart Explorer via the Task Manager or restart your computer before continuing.</String>
<String Id="REQUIRE_NET_FRAMEWORK">This application requires the .NET Framework version at least 3.5. Please install the .NET Framework then run this installer again.</String>
</WixLocalization>
27 changes: 18 additions & 9 deletions Installer/lang_zh_CN.wxl
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="zh-cn" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="YOURLOCID">你的本地字符串</String>
<String Id="READ_INFO">请阅读以下信息。</String>
<String Id="CLOSE_TABS">关闭所有的资源管理器窗口并且重新打开</String>
<String Id="COMPILE_IMG">编译本地图像</String>
<String Id="GPL_FILE">GPL3_zh_CN.rtf</String>
</WixLocalization>

<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="zh-cn" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="YOURLOCID">你的本地字符串</String>
<String Id="READ_INFO">请阅读以下信息。</String>
<String Id="CLOSE_TABS">关闭所有的资源管理器窗口并且重新打开</String>
<String Id="COMPILE_IMG">编译本地图像</String>
<String Id="GPL_FILE">GPL3_zh_CN.rtf</String>
<String Id="STANDARD_BUTTONS">QTTab标准按钮</String>
<String Id="DESKTOP_TOOL">QTTab桌面工具</String>

<String Id="QTTABBAR_ATUOLOADER">QTTabBar自动加载器</String>

<String Id="ALREADY_INSTALLED">已安装较新的版本。</String>
<String Id="DETECTED_OLD_VERSION">安装程序检测到已安装较旧版本的QTTabBar。 由于安装程序的更改，您必须手动卸载此旧版本并重新启动Explorer，然后才能继续。 卸载较旧的版本并重新启动资源管理器后，请再次运行安装程序。</String>
<String Id="STILL_OLD_VERSION">似乎Windows资源管理器中仍加载了旧版本的QTTabBar。 请通过任务管理器重新启动资源管理器或重新启动计算机，然后再继续。</String>
<String Id="REQUIRE_NET_FRAMEWORK">此应用程序要求.NET Framework版本至少为3.5。 请安装.NET Framework，然后再次运行此安装程序。</String>
</WixLocalization>

12 changes: 6 additions & 6 deletions QTTabBar/Config.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ public _Tabs() {
ShowCloseButtons = true; // 显示关闭按钮
CloseBtnsWithAlt = false; // 只有alt按住进行关闭
CloseBtnsOnHover = false; // 仅鼠标悬浮关闭
ShowNavButtons = true; // 在标签显示导航按钮
ShowNavButtons = false; // 在标签显示导航按钮 ( (默认配置关闭按钮显示)标签栏右侧的两个按钮能否添加一个选项以控制是否去掉呢。#28）
NavButtonsOnRight = true; // 在最右边
MultipleTabRows = true; // 允许多行标签
ActiveTabOnBottomRow = true; // 始终将活动标签置于底部行
Expand Down Expand Up @@ -557,7 +557,7 @@ public _Skin() {
// RebarColor = Color.FromArgb(230,230,230);
// 设置标签背景色
RebarColor = Color.FromArgb(245,246,247);
UseRebarImage = false; // 是否工具栏自定义图片
UseRebarImage = true; // 是否工具栏自定义图片,启用自定义图片
RebarStretchMode = StretchMode.Tile;
RebarImageFile = ""; // 工具栏自定义图片
RebarImageSeperateBars = false;
Expand Down Expand Up @@ -594,10 +594,10 @@ public _BBar() {
: new System.Int32[] { 3, 4, 5, 0, 6, 7, 0, 17, 11, 12, 14, 15, 13, 0, 21, 9, 19, 10 };
ActivePluginIDs = new string[0];
LargeButtons = false; // 是否显示大按钮
LockSearchBarWidth = true;
LockDropDownButtons = true;
ShowButtonLabels = true;
ImageStripPath = "";
LockSearchBarWidth = true; // 锁定搜索框大小
LockDropDownButtons = true; // 锁定下拉按钮菜单顺序
ShowButtonLabels = true; // 是否显示按钮标签
ImageStripPath = ""; // 自定义图片路径
}
}

Expand Down
Loading

0 comments on commit a606a78

Please sign in to comment.