Skip to content

Commit

Permalink
优化duidemo
Browse files Browse the repository at this point in the history
  • Loading branch information
Troy committed Jul 29, 2015
1 parent 5801f67 commit b8ee583
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 28 deletions.
4 changes: 4 additions & 0 deletions Demos/duidemo/MainWnd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@ class CDemoFrame : public WindowImplBase, public CWebBrowserEventHandler, public
m_pPopWnd->CenterWindow();
::ShowWindow(*m_pPopWnd, SW_SHOW);
}
else if(sName.CompareNoCase(_T("qq_btn")) == 0)
{
ShellExecute(NULL, _T("open"), NULL, _T("tencent://Message/?Uin=656067418&Menu=yes"), NULL, SW_SHOW);
}
}

LRESULT OnSysCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
Expand Down
Binary file modified Demos/duidemo/Res/duidemo.zip
View file
Binary file not shown.
Binary file modified DuiLib.suo
View file
Binary file not shown.
Binary file modified bin/skin/duidemo/bg.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 29 additions & 13 deletions bin/skin/duidemo/main.xml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<Window size="800,572" sizebox="4,4,6,6" roundcorner="0,0" caption="0,0,0,64" mininfo="400,300" showshadow="true" shadowimage="main/shadow.png" shadowsize="6,6" shadowcorner="8,8,8,8">
<Window size="800,572" sizebox="4,4,6,6" roundcorner="0,0" caption="0,0,0,64" mininfo="400,300" showshadow="true" shadowimage="main/shadow.png" shadowsize="6" shadowcorner="8,8,8,8">
<Font name="宋体" size="13" bold="true" />
<Font name="宋体" size="12" bold="true" underline="true"/>
<Font name="宋体" size="12" />
<Font name="宋体" size="22" bold="true"/>
<Default name="VScrollBar" value="button1normalimage=&quot;file='scrollbar.bmp' source='0,90,16,106' mask='#FFFF00FF'&quot; button1hotimage=&quot;file='scrollbar.bmp' source='18,90,34,106' mask='#FFFF00FF'&quot; button1pushedimage=&quot;file='scrollbar.bmp' source='36,90,52,106' mask='#FFFF00FF'&quot; button1disabledimage=&quot;file='scrollbar.bmp' source='54,90,70,106' mask='#FFFF00FF'&quot; button2normalimage=&quot;file='scrollbar.bmp' source='0,108,16,124' mask='#FFFF00FF'&quot; button2hotimage=&quot;file='scrollbar.bmp' source='18,108,34,124' mask='#FFFF00FF'&quot; button2pushedimage=&quot;file='scrollbar.bmp' source='36,108,52,124' mask='#FFFF00FF'&quot; button2disabledimage=&quot;file='scrollbar.bmp' source='54,108,70,124' mask='#FFFF00FF'&quot; thumbnormalimage=&quot;file='scrollbar.bmp' source='0,126,16,142' corner='2,2,2,2' mask='#FFFF00FF'&quot; thumbhotimage=&quot;file='scrollbar.bmp' source='18,126,34,142' corner='2,2,2,2' mask='#FFFF00FF'&quot; thumbpushedimage=&quot;file='scrollbar.bmp' source='36,126,52,142' corner='2,2,2,2' mask='#FFFF00FF'&quot; thumbdisabledimage=&quot;file='scrollbar.bmp' source='54,126,70,142' corner='2,2,2,2' mask='#FFFF00FF'&quot; railnormalimage=&quot;file='scrollbar.bmp' source='0,144,16,160' corner='2,2,2,2' mask='#FFFF00FF'&quot; railhotimage=&quot;file='scrollbar.bmp' source='18,144,34,160' corner='2,2,2,2' mask='#FFFF00FF'&quot; railpushedimage=&quot;file='scrollbar.bmp' source='36,144,52,160' corner='2,2,2,2' mask='#FFFF00FF'&quot; raildisabledimage=&quot;file='scrollbar.bmp' source='54,144,70,160' corner='2,2,2,2' mask='#FFFF00FF'&quot; bknormalimage=&quot;file='scrollbar.bmp' source='0,162,16,178' corner='2,2,2,2' mask='#FFFF00FF'&quot; bkhotimage=&quot;file='scrollbar.bmp' source='18,162,34,178' corner='2,2,2,2' mask='#FFFF00FF'&quot; bkpushedimage=&quot;file='scrollbar.bmp' source='36,162,52,178' corner='2,2,2,2' mask='#FFFF00FF'&quot; bkdisabledimage=&quot;file='scrollbar.bmp' source='54,162,70,178' corner='2,2,2,2' mask='#FFFF00FF'&quot; " />
<Default name="HScrollBar" value="button1normalimage=&quot;file='scrollbar.bmp' source='0,0,16,16' mask='#FFFF00FF'&quot; button1hotimage=&quot;file='scrollbar.bmp' source='18,0,34,16' mask='#FFFF00FF'&quot; button1pushedimage=&quot;file='scrollbar.bmp' source='36,0,52,16' mask='#FFFF00FF'&quot; button1disabledimage=&quot;file='scrollbar.bmp' source='54,0,70,16' mask='#FFFF00FF'&quot; button2normalimage=&quot;file='scrollbar.bmp' source='0,18,16,34' mask='#FFFF00FF'&quot; button2hotimage=&quot;file='scrollbar.bmp' source='18,18,34,34' mask='#FFFF00FF'&quot; button2pushedimage=&quot;file='scrollbar.bmp' source='36,18,52,34' mask='#FFFF00FF'&quot; button2disabledimage=&quot;file='scrollbar.bmp' source='54,18,70,34' mask='#FFFF00FF'&quot; thumbnormalimage=&quot;file='scrollbar.bmp' source='0,36,16,52' corner='2,2,2,2' mask='#FFFF00FF'&quot; thumbhotimage=&quot;file='scrollbar.bmp' source='18,36,34,52' corner='2,2,2,2' mask='#FFFF00FF'&quot; thumbpushedimage=&quot;file='scrollbar.bmp' source='36,36,52,52' corner='2,2,2,2' mask='#FFFF00FF'&quot; thumbdisabledimage=&quot;file='scrollbar.bmp' source='54,36,70,52' corner='2,2,2,2' mask='#FFFF00FF'&quot; railnormalimage=&quot;file='scrollbar.bmp' source='0,54,16,70' corner='2,2,2,2' mask='#FFFF00FF'&quot; railhotimage=&quot;file='scrollbar.bmp' source='18,54,34,70' corner='2,2,2,2' mask='#FFFF00FF'&quot; railpushedimage=&quot;file='scrollbar.bmp' source='36,54,52,70' corner='2,2,2,2' mask='#FFFF00FF'&quot; raildisabledimage=&quot;file='scrollbar.bmp' source='54,54,70,70' corner='2,2,2,2' mask='#FFFF00FF'&quot; bknormalimage=&quot;file='scrollbar.bmp' source='0,72,16,88' corner='2,2,2,2' mask='#FFFF00FF'&quot; bkhotimage=&quot;file='scrollbar.bmp' source='18,72,34,88' corner='2,2,2,2' mask='#FFFF00FF'&quot; bkpushedimage=&quot;file='scrollbar.bmp' source='36,72,52,88' corner='2,2,2,2' mask='#FFFF00FF'&quot; bkdisabledimage=&quot;file='scrollbar.bmp' source='54,72,70,88' corner='2,2,2,2' mask='#FFFF00FF'&quot; " />

<VerticalLayout name="root" bkimage="file='main\3.jpg' corner='6,97,6,29'" inset="1,0,1,0" bordercolor="#FF768D9B" bordersize="1" borderround="5,5">
<HorizontalLayout name="appbar" height="64" inset="0,-1">
<VerticalLayout name="root" bkimage="file='main\10.jpg' corner='580,370,10,5'" bordercolor="#FF768D9B" bordersize="0" borderround="0,0">
<HorizontalLayout name="appbar" height="64" >
<HorizontalLayout name="apptitle" childpadding="6">
<Container width="64" height="64" bkimage="logo.png" />
<Container width="64" height="64" bkimage="logo.jpg" />
<VerticalLayout>
<Label text="Duilib 使用演示 v1.0" width="300" align="vcenter" align="left" textcolor="#FF000000" font="3" tooltip="官网"/>
<Button name="homepage_btn" text="演示官网" width="60" align="vcenter" align="left" textcolor="#FF000000" hottextcolor="#FF0000FF" font="1" tooltip="官网"/>
<Label text="Duilib 使用演示 v1.1" width="300" align="vcenter" align="left" textcolor="#FFEEEEEE" font="3" tooltip="官网"/>
<Button name="homepage_btn" text="演示官网" width="60" align="vcenter" align="left" textcolor="#FFEEEEEE" hottextcolor="#FF0000FF" font="1" tooltip="官网"/>
<Label text="duilib开源项目圈（261675375）- Troy(QQ：656067418)" align="left" textcolor="#FFFF0000"/>
</VerticalLayout>
</HorizontalLayout>

<Button name="skinbtn" width="28" height="20" tooltip="皮肤" normalimage="file='sysbtn/btn_skin_normal.png'" hotimage="file='sysbtn/btn_skin_highlight.png'" pushedimage="file='sysbtn/btn_skin_down.png' "/>
<Button name="minbtn" width="28" height="20" tooltip="最小化" normalimage="file='sysbtn/btn_mini_normal.png'" hotimage="file='sysbtn/btn_mini_highlight.png'" pushedimage="file='sysbtn/btn_mini_down.png' "/>
<Button name="maxbtn" width="28" height="20" tooltip="最大化" normalimage="file='sysbtn/btn_max_normal.png'" hotimage="file='sysbtn/btn_max_highlight.png'" pushedimage="file='sysbtn/btn_max_down.png' "/>
<Button name="restorebtn" width="28" height="20" tooltip="还原" visible="false" normalimage="file='sysbtn/btn_restore_normal.png'" hotimage="file='sysbtn/btn_restore_highlight.png'" pushedimage="file='sysbtn/btn_restore_down.png' "/>
<Button name="closebtn" width="39" height="20" tooltip="关闭" normalimage="file='sysbtn/btn_close_normal.png'" hotimage="file='sysbtn/btn_close_highlight.png'" pushedimage="file='sysbtn/btn_close_down.png' "/>
<HorizontalLayout inset="0，-1,0,0" width="123">
<Button name="skinbtn" width="28" height="20" tooltip="皮肤" normalimage="file='sysbtn/btn_skin_normal.png'" hotimage="file='sysbtn/btn_skin_highlight.png'" pushedimage="file='sysbtn/btn_skin_down.png' "/>
<Button name="minbtn" width="28" height="20" tooltip="最小化" normalimage="file='sysbtn/btn_mini_normal.png'" hotimage="file='sysbtn/btn_mini_highlight.png'" pushedimage="file='sysbtn/btn_mini_down.png' "/>
<Button name="maxbtn" width="28" height="20" tooltip="最大化" normalimage="file='sysbtn/btn_max_normal.png'" hotimage="file='sysbtn/btn_max_highlight.png'" pushedimage="file='sysbtn/btn_max_down.png' "/>
<Button name="restorebtn" width="28" height="20" tooltip="还原" visible="false" normalimage="file='sysbtn/btn_restore_normal.png'" hotimage="file='sysbtn/btn_restore_highlight.png'" pushedimage="file='sysbtn/btn_restore_down.png' "/>
<Button name="closebtn" width="39" height="20" tooltip="关闭" normalimage="file='sysbtn/btn_close_normal.png'" hotimage="file='sysbtn/btn_close_highlight.png'" pushedimage="file='sysbtn/btn_close_down.png' "/>
</HorizontalLayout>

</HorizontalLayout>

<VerticalLayout name="body" bkcolor="#FFFFFFFF">
Expand All @@ -37,7 +40,7 @@
<TabLayout name="tab_switch">
<VerticalLayout name="basic_tab_panel" inset="2,2,2,2">
<Label height="1" bkimage="hor_line.bmp"/>
<HorizontalLayout height="60" bordercolor="#FF00FF00" bordersize="1">
<HorizontalLayout height="60">
<Label text="按钮控件" textcolor="#FF555555" glowsize="0" font="font13" width="80"/>
<VerticalLayout >
<Control />
Expand Down Expand Up @@ -104,8 +107,21 @@
<Control />
</VerticalLayout>
</HorizontalLayout>

<Label height="1" bkimage="hor_line.bmp"/>

<HorizontalLayout height="60">
<Label text="窗口演示" textcolor="#FF555555" glowsize="0" font="font13" width="80"/>
<VerticalLayout >
<Control />
<HorizontalLayout height="30" childpadding="12">
<Button name="popwnd_btn" text="弹出窗口" textcolor="#FF555555" normalimage="res='button_normal.png' corner='4,4,4,4'" hotimage="res='button_hover.png' corner='4,4,4,4'" pushedimage="res='button_pushed.png' corner='4,4,4,4'" width="100"/>
<Button name="qq_btn" text="问题咨询" textcolor="#FF555555" normalimage="res='button_normal.png' corner='4,4,4,4'" hotimage="res='button_hover.png' corner='4,4,4,4'" pushedimage="res='button_pushed.png' corner='4,4,4,4'" width="100"/>
</HorizontalLayout>
<Control />
</VerticalLayout>
</HorizontalLayout>
<Label height="1" bkimage="hor_line.bmp"/>

</VerticalLayout>
<VerticalLayout name="rich_tab_panel" inset="2,2,2,2" vscrollbar="true">
<Label height="1" bkimage="hor_line.bmp"/>
Expand Down
Binary file added bin/skin/duidemo/main/10.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 4 additions & 15 deletions bin/skin/duidemo/popup.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD
<Window caption="0,0,0,415" size="600,384" mininfo="600,384" sizebox="6,6,6,6" bktrans="false">
<Font name="宋体" size="12" default="true"/>

<VerticalLayout bkimage="res='bg.png' corner='6,97,6,29' fade='200'">
=======

<Window caption="0,0,0,415" size="600,384" mininfo="600,384" sizebox="6,6,6,6" bktrans="true">
<Font name="宋体" size="12" default="true"/>

<VerticalLayout bkimage="res='bg.png' corner='6,97,6,29' fade='255'">
>>>>>>> origin/master
<VerticalLayout bkimage="res='bg.png' corner='6,97,6,29' fade='200'">

<HorizontalLayout name="appbar" height="64" inset="0,-1">
<HorizontalLayout name="apptitle" childpadding="6">
<Container padding="2,3,0,0" width="64" height="64" bkimage="logo.jpg" />
Expand All @@ -20,13 +15,7 @@
</HorizontalLayout>

<Button name="minbtn" width="28" height="20" tooltip="最小化" normalimage="file='sysbtn/btn_mini_normal.png'" hotimage="file='sysbtn/btn_mini_highlight.png'" pushedimage="file='sysbtn/btn_mini_down.png' "/>
<<<<<<< HEAD
<Button name="maxbtn" width="28" height="20" tooltip="最大化" normalimage="file='sysbtn/btn_max_normal.png'" hotimage="file='sysbtn/btn_max_highlight.png'" pushedimage="file='sysbtn/btn_max_down.png' "/>
<Button name="restorebtn" width="28" height="20" tooltip="还原" visible="false" normalimage="file='sysbtn/btn_restore_normal.png'" hotimage="file='sysbtn/btn_restore_highlight.png'" pushedimage="file='sysbtn/btn_restore_down.png' "/>
=======
<!--<Button name="maxbtn" width="28" height="20" tooltip="最大化" normalimage="file='sysbtn/btn_max_normal.png'" hotimage="file='sysbtn/btn_max_highlight.png'" pushedimage="file='sysbtn/btn_max_down.png' "/>-->
<!--<Button name="restorebtn" width="28" height="20" tooltip="还原" visible="false" normalimage="file='sysbtn/btn_restore_normal.png'" hotimage="file='sysbtn/btn_restore_highlight.png'" pushedimage="file='sysbtn/btn_restore_down.png' "/>-->
>>>>>>> origin/master

<Button name="closebtn" width="39" height="20" tooltip="关闭" normalimage="file='sysbtn/btn_close_normal.png'" hotimage="file='sysbtn/btn_close_highlight.png'" pushedimage="file='sysbtn/btn_close_down.png' "/>
</HorizontalLayout>

Expand Down

0 comments on commit b8ee583

Please sign in to comment.