MirandaG15:

- fixed options pages

git-svn-id: http://svn.miranda-ng.org/main/trunk@14488 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 47 insertions, 40 deletions

diff --git a/plugins/MirandaG15/res/MirandaG15.rc b/plugins/MirandaG15/res/MirandaG15.rc
index 73a9f83253..32622ef557 100644
--- a/plugins/MirandaG15/res/MirandaG15.rc
+++ b/plugins/MirandaG15/res/MirandaG15.rc
@@ -163,42 +163,44 @@
 #define IDC_STC16 1053

 #define IDC_GRP4 1050

 #include "..\src\resource.h"

-IDB_BACK BITMAP DISCARDABLE "res/back.bmp"

-IDB_CHAT BITMAP DISCARDABLE "res/chat.bmp"

-IDB_CLIST BITMAP DISCARDABLE "res/clist.bmp"

-IDB_DOWN BITMAP DISCARDABLE "res/down.bmp"

-IDB_EDIT BITMAP DISCARDABLE "res/edit.bmp"

-IDB_HISTORY BITMAP DISCARDABLE "res/hist.bmp"

-IDB_MINUS BITMAP DISCARDABLE "res/minus.bmp"

-IDB_OPEN BITMAP DISCARDABLE "res/open.bmp"

-IDB_PLUS BITMAP DISCARDABLE "res/plus.bmp"

-IDB_PREV BITMAP DISCARDABLE "res/prev.bmp"

-IDB_REPLY BITMAP DISCARDABLE "res/reply.bmp"

-IDB_SEND BITMAP DISCARDABLE "res/send.bmp"

-IDB_UP BITMAP DISCARDABLE "res/up.bmp"

-IDI_NOTICK ICON DISCARDABLE "res/notick.ico"

-IDI_TICK ICON DISCARDABLE "res/tick.ico"

-IDB_NEXT BITMAP DISCARDABLE "res/next.bmp"

-IDB_STATUS_OFFLINE BITMAP DISCARDABLE "res/status/off.bmp"

-IDB_STATUS_ONLINE BITMAP DISCARDABLE "res/status/on.bmp"

-IDB_STATUS_AWAY BITMAP DISCARDABLE "res/status/away.bmp"

-IDB_STATUS_NA BITMAP DISCARDABLE "res/status/na.bmp"

-IDB_STATUS_OCCUPIED BITMAP DISCARDABLE "res/status/occ.bmp"

-IDB_STATUS_DND BITMAP DISCARDABLE "res/status/dnd.bmp"

-IDB_STATUS_INVISIBLE BITMAP DISCARDABLE "res/status/invis.bmp"

-IDB_STATUS_FFC BITMAP DISCARDABLE "res/status/ffc.bmp"

-IDB_EVENT_INFO BITMAP DISCARDABLE "res/events/info.bmp"

-IDB_EVENT_CON BITMAP DISCARDABLE "res/events/conn.bmp"

-IDB_EVENT_USER BITMAP DISCARDABLE "res/events/user.bmp"

-IDB_EVENT_MSG BITMAP DISCARDABLE "res/events/msg.bmp"

-IDB_EVENT_INFO_LARGE BITMAP DISCARDABLE "res/events/info_large.bmp"

-IDB_EVENT_CON_LARGE BITMAP DISCARDABLE "res/events/conn_large.bmp"

-IDB_EVENT_USER_LARGE BITMAP DISCARDABLE "res/events/user_large.bmp"

-IDB_EVENT_MSG_LARGE BITMAP DISCARDABLE "res/events/msg_large.bmp"

+IDB_BACK BITMAP DISCARDABLE "back.bmp"

+IDB_CHAT BITMAP DISCARDABLE "chat.bmp"

+IDB_CLIST BITMAP DISCARDABLE "clist.bmp"

+IDB_DOWN BITMAP DISCARDABLE "down.bmp"

+IDB_EDIT BITMAP DISCARDABLE "edit.bmp"

+IDB_HISTORY BITMAP DISCARDABLE "hist.bmp"

+IDB_MINUS BITMAP DISCARDABLE "minus.bmp"

+IDB_OPEN BITMAP DISCARDABLE "open.bmp"

+IDB_PLUS BITMAP DISCARDABLE "plus.bmp"

+IDB_PREV BITMAP DISCARDABLE "prev.bmp"

+IDB_REPLY BITMAP DISCARDABLE "reply.bmp"

+IDB_SEND BITMAP DISCARDABLE "send.bmp"

+IDB_UP BITMAP DISCARDABLE "up.bmp"

+IDI_NOTICK ICON DISCARDABLE "notick.ico"

+IDI_TICK ICON DISCARDABLE "tick.ico"

+IDB_NEXT BITMAP DISCARDABLE "next.bmp"

+IDB_STATUS_OFFLINE BITMAP DISCARDABLE "status/off.bmp"

+IDB_STATUS_ONLINE BITMAP DISCARDABLE "status/on.bmp"

+IDB_STATUS_AWAY BITMAP DISCARDABLE "status/away.bmp"

+IDB_STATUS_NA BITMAP DISCARDABLE "status/na.bmp"

+IDB_STATUS_OCCUPIED BITMAP DISCARDABLE "status/occ.bmp"

+IDB_STATUS_DND BITMAP DISCARDABLE "status/dnd.bmp"

+IDB_STATUS_INVISIBLE BITMAP DISCARDABLE "status/invis.bmp"

+IDB_STATUS_FFC BITMAP DISCARDABLE "status/ffc.bmp"

+IDB_EVENT_INFO BITMAP DISCARDABLE "events/info.bmp"

+IDB_EVENT_CON BITMAP DISCARDABLE "events/conn.bmp"

+IDB_EVENT_USER BITMAP DISCARDABLE "events/user.bmp"

+IDB_EVENT_MSG BITMAP DISCARDABLE "events/msg.bmp"

+IDB_EVENT_INFO_LARGE BITMAP DISCARDABLE "events/info_large.bmp"

+IDB_EVENT_CON_LARGE BITMAP DISCARDABLE "events/conn_large.bmp"

+IDB_EVENT_USER_LARGE BITMAP DISCARDABLE "events/user_large.bmp"

+IDB_EVENT_MSG_LARGE BITMAP DISCARDABLE "events/msg_large.bmp"

+

+

 IDD_FONTS DIALOGEX 0,0,302,244

-CAPTION "Fonts"

 FONT 8,"MS Shell Dlg",400,0,1

-STYLE 0x80C00048

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+EXSTYLE WS_EX_CONTROLPARENT

 BEGIN

   CONTROL "General settings",IDC_STATIC11,"Button",0x50000007,0,0,300,111

   CONTROL "Show softkey labels",IDC_SHOW_LABELS,"Button",0x50010003,6,22,118,13

@@ -236,10 +238,11 @@ BEGIN
   CONTROL "Lock the screen",IDC_SCREENSAVER_LOCK,"Button",0x50010003,14,70,126,9

   CONTROL "Skip driver missing notification",IDC_SKIP_DRIVER_ERROR,"Button",0x50010003,6,42,112,9

 END

+

 IDD_NOTIFICATIONS DIALOGEX 0,0,304,240

-CAPTION "Notifications"

 FONT 8,"MS Shell Dlg",400,0,1

-STYLE 0x80C80048

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+EXSTYLE WS_EX_CONTROLPARENT

 BEGIN

   CONTROL "General settings",IDC_STATIC18,"Button",0x50000007,0,0,160,80

   CONTROL "Notification screen title",IDC_STATIC19,"Button",0x50000007,0,81,160,43

@@ -289,10 +292,11 @@ BEGIN
   CONTROL "Cut off channel names after",IDC_NOTIFY_CHANNELCUTOFF,"Button",0x50010003,4,57,90,9

   CONTROL "",IDC_NOTIFY_CHANNELCUTOFF_OFFSET,"Edit",0x50012080,102,57,22,11,0x00000200

 END

+

 IDD_CLIST DIALOGEX 0,0,304,179

-CAPTION "Contact list"

 FONT 8,"MS Shell Dlg",400,0,1

-STYLE 0x80C80048

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+EXSTYLE WS_EX_CONTROLPARENT

 BEGIN

   CONTROL "General settings",IDC_STATIC9,"Button",0x50000007,0,0,174,135

   CONTROL "Show the contacts protocols",IDC_CLIST_SHOWPROTO,"Button",0x50010003,6,11,154,13

@@ -313,10 +317,11 @@ BEGIN
   CONTROL "Use two columns",IDC_CLIST_COLUMNS,"Button",0x50010003,6,55,160,13

   CONTROL "Fade out selection rectangle",IDC_CLIST_SELECTION,"Button",0x50010003,6,66,160,13

 END

+

 IDD_CHAT DIALOGEX 0,0,302,193

-CAPTION "Chat"

 FONT 8,"MS Shell Dlg",400,0,1

-STYLE 0x80C80048

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+EXSTYLE WS_EX_CONTROLPARENT

 BEGIN

   CONTROL "Typing notifications",IDC_STATIC1,"Button",0x50000007,160,105,140,33

   CONTROL "Show typing notifications",IDC_SESSION_SHOWTYPING,"Button",0x50010003,168,114,126,11

diff --git a/plugins/MirandaG15/src/resource.h b/plugins/MirandaG15/src/resource.h
index 97390427be..f30559a0fc 100644
--- a/plugins/MirandaG15/src/resource.h
+++ b/plugins/MirandaG15/src/resource.h
@@ -1,3 +1,5 @@
+#include <windows.h>

+

 #define IDD_FONTS               102

 #define IDC_STATIC11            3000

 #define IDC_STATIC12            3002