Commit 0bf1163b authored by Ed "oddsock" Zaleski's avatar Ed "oddsock" Zaleski

#590

Credits now for Icecast2 Win32... whoop-de-doo...

svn path=/icecast/trunk/icecast/; revision=9761
parent 3e77a82d
......@@ -2,7 +2,7 @@
[General Info]
Version=1
LastClass=CStatus
LastClass=CIcecast2winDlg
LastTemplate=CDialog
NewFileInclude1=#include "stdafx.h"
NewFileInclude2=#include "Icecast2win.h"
......@@ -13,19 +13,19 @@ Class2=CIcecast2winDlg
Class3=CAboutDlg
ResourceCount=10
Resource1=IDD_SSTATUS
Resource1=IDR_MENU2
Resource2=IDR_MAINFRAME
Resource3=IDD_STATSDIALOG
Resource4=IDR_MENU2
Resource3=IDR_TRAY
Resource4=IDR_MENU4
Class4=CStatus
Resource5=IDR_TRAY
Resource5=IDD_SSTATUS
Class5=CConfigTab
Class6=CStatsTab
Resource6=IDR_MENU4
Resource7=IDD_ICECAST2WIN_DIALOG
Resource8=IDD_CONFIGDIALOG
Resource9=IDR_MENU3
Resource10=IDD_ABOUTBOX
Resource6=IDD_CONFIGDIALOG
Resource7=IDD_STATSDIALOG
Resource8=IDR_MENU3
Resource9=IDD_ABOUTBOX
Resource10=IDD_ICECAST2WIN_DIALOG
[CLS:CIcecast2winApp]
Type=0
......@@ -34,13 +34,13 @@ ImplementationFile=Icecast2win.cpp
Filter=N
[CLS:CIcecast2winDlg]
Type=0
HeaderFile=Icecast2winDlg.h
ImplementationFile=Icecast2winDlg.cpp
Filter=C
LastObject=ID_ABOUT_HELP
BaseClass=CResizableDialog
VirtualFilter=dWC
Type=0
HeaderFile=Icecast2winDlg.h
ImplementationFile=Icecast2winDlg.cpp
Filter=C
LastObject=ID_ABOUT_CREDITS
BaseClass=CDialog
VirtualFilter=dWC
[CLS:CAboutDlg]
Type=0
......@@ -51,23 +51,21 @@ Filter=D
[DLG:IDD_ABOUTBOX]
Type=1
Class=CAboutDlg
ControlCount=3
Control1=IDC_STATIC,static,1342177283
Control2=IDC_STATIC,static,1342308480
Control3=IDOK,button,1342373889
ControlCount=2
Control1=IDOK,button,1342373889
Control2=IDC_STATIC,static,1350572046
[DLG:IDD_ICECAST2WIN_DIALOG]
Type=1
Class=CIcecast2winDlg
ControlCount=8
ControlCount=7
Control1=IDC_MAINTAB,SysTabControl32,1342177280
Control2=IDC_START,button,1342242816
Control3=IDC_AUTOSTART,button,1342251011
Control4=IDC_STATIC,static,1342177294
Control5=IDC_SERVERSTATUS,static,1342177294
Control6=IDC_STATIC_SS,static,1342308865
Control7=IDC_STATICBLACK,static,1342177294
Control8=IDC_HIDESYSTRAY,button,1342242816
Control7=IDC_HIDESYSTRAY,button,1342242816
[DLG:IDD_SSTATUS]
Type=1
......
......@@ -199,6 +199,10 @@ SOURCE=.\black.bmp
# End Source File
# Begin Source File
SOURCE=.\credits.bmp
# End Source File
# Begin Source File
SOURCE=.\cursor1.cur
# End Source File
# Begin Source File
......@@ -227,6 +231,10 @@ SOURCE=.\icecast2logo2.bmp
# End Source File
# Begin Source File
SOURCE=.\icecast2title.bmp
# End Source File
# Begin Source File
SOURCE=.\res\Icecast2win.ico
# End Source File
# Begin Source File
......
......@@ -64,14 +64,14 @@ END
// Dialog
//
IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 235, 55
IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 375, 163
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "About Icecast2win"
CAPTION "Icecast Credits"
FONT 8, "MS Sans Serif"
BEGIN
ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20
LTEXT "Icecast 2 Win32",IDC_STATIC,40,10,119,8,SS_NOPREFIX
DEFPUSHBUTTON "OK",IDOK,178,7,50,14,WS_GROUP
DEFPUSHBUTTON "OK",IDOK,157,141,50,14,WS_GROUP
CONTROL 163,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE |
SS_SUNKEN | WS_BORDER,7,7,361,145
END
IDD_ICECAST2WIN_DIALOG DIALOGEX 0, 0, 326, 259
......@@ -86,12 +86,11 @@ BEGIN
CONTROL "Start Server on Application Startup",IDC_AUTOSTART,
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,76,
29,81,17
CONTROL 159,IDC_STATIC,"Static",SS_BITMAP,0,0,117,20
CONTROL 164,IDC_STATIC,"Static",SS_BITMAP,0,0,117,20
CONTROL 151,IDC_SERVERSTATUS,"Static",SS_BITMAP,173,32,65,18,
WS_EX_CLIENTEDGE
CTEXT "Server Status",IDC_STATIC_SS,172,23,65,10,
SS_CENTERIMAGE
CONTROL 150,IDC_STATICBLACK,"Static",SS_BITMAP,116,0,214,20
PUSHBUTTON "Hide To Systray",IDC_HIDESYSTRAY,262,22,58,12
END
......@@ -183,9 +182,9 @@ BEGIN
IDD_ABOUTBOX, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 228
RIGHTMARGIN, 368
TOPMARGIN, 7
BOTTOMMARGIN, 48
BOTTOMMARGIN, 155
END
END
#endif // APSTUDIO_INVOKED
......@@ -200,6 +199,8 @@ IDB_BITMAP4 BITMAP DISCARDABLE "black.bmp"
IDB_BITMAP5 BITMAP DISCARDABLE "stopped.bmp"
IDB_BITMAP6 BITMAP DISCARDABLE "running.bmp"
IDB_BITMAP7 BITMAP DISCARDABLE "icecast2logo2.bmp"
IDB_BITMAP8 BITMAP DISCARDABLE "credits.bmp"
IDB_BITMAP9 BITMAP DISCARDABLE "icecast2title.bmp"
/////////////////////////////////////////////////////////////////////////////
//
......
......@@ -241,24 +241,25 @@ void CIcecast2winDlg::DoDataExchange(CDataExchange* pDX)
BEGIN_MESSAGE_MAP(CIcecast2winDlg, CDialog)
//{{AFX_MSG_MAP(CIcecast2winDlg)
ON_WM_SYSCOMMAND()
ON_WM_PAINT()
ON_WM_QUERYDRAGICON()
ON_NOTIFY(TCN_SELCHANGE, IDC_MAINTAB, OnSelchangeMaintab)
ON_COMMAND(ID_FILE_EXIT, OnFileExit)
ON_WM_TIMER()
ON_COMMAND(ID_FILE_STARTSERVER, OnFileStartserver)
ON_COMMAND(ID_FILE_STOPSERVER, OnFileStopserver)
ON_BN_CLICKED(IDC_START, OnStart)
ON_WM_CLOSE()
ON_WM_SIZE()
ON_BN_CLICKED(IDC_HIDESYSTRAY, OnHidesystray)
ON_COMMAND(ID_BLANK_RESTORE, OnBlankRestore)
ON_MESSAGE(WM_TRAY_NOTIFY, OnTrayNotify)
ON_WM_DESTROY()
ON_COMMAND(ID_FILE_EDITCONFIGURATION, OnFileEditconfiguration)
ON_COMMAND(ID_ABOUT_HELP, OnAboutHelp)
//}}AFX_MSG_MAP
ON_WM_SYSCOMMAND()
ON_WM_PAINT()
ON_WM_QUERYDRAGICON()
ON_NOTIFY(TCN_SELCHANGE, IDC_MAINTAB, OnSelchangeMaintab)
ON_COMMAND(ID_FILE_EXIT, OnFileExit)
ON_WM_TIMER()
ON_COMMAND(ID_FILE_STARTSERVER, OnFileStartserver)
ON_COMMAND(ID_FILE_STOPSERVER, OnFileStopserver)
ON_BN_CLICKED(IDC_START, OnStart)
ON_WM_CLOSE()
ON_WM_SIZE()
ON_BN_CLICKED(IDC_HIDESYSTRAY, OnHidesystray)
ON_COMMAND(ID_BLANK_RESTORE, OnBlankRestore)
ON_MESSAGE(WM_TRAY_NOTIFY, OnTrayNotify)
ON_WM_DESTROY()
ON_COMMAND(ID_FILE_EDITCONFIGURATION, OnFileEditconfiguration)
ON_COMMAND(ID_ABOUT_HELP, OnAboutHelp)
ON_COMMAND(ID_ABOUT_CREDITS, OnAboutCredits)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
......@@ -1190,3 +1191,10 @@ void CIcecast2winDlg::OnAboutHelp()
// TODO: Add your command handler code here
ShellExecute(NULL, "open", "doc\\icecast2.chm", NULL, NULL, SW_SHOWNORMAL);
}
void CIcecast2winDlg::OnAboutCredits()
{
// TODO: Add your command handler code here
CAboutDlg about;
about.DoModal();
}
......@@ -94,26 +94,27 @@ protected:
// Generated message map functions
//{{AFX_MSG(CIcecast2winDlg)
virtual BOOL OnInitDialog();
afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
afx_msg void OnPaint();
afx_msg HCURSOR OnQueryDragIcon();
afx_msg void OnSelchangeMaintab(NMHDR* pNMHDR, LRESULT* pResult);
afx_msg void OnFileExit();
afx_msg void OnTimer(UINT nIDEvent);
afx_msg void OnFileStartserver();
afx_msg void OnFileStopserver();
afx_msg void OnStart();
afx_msg void OnClose();
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnHidesystray();
afx_msg void OnHide();
afx_msg void OnBlankRestore();
afx_msg LONG OnTrayNotify ( WPARAM wParam, LPARAM lParam );
afx_msg void OnDestroy();
afx_msg void OnFileEditconfiguration();
afx_msg void OnAboutHelp();
//}}AFX_MSG
virtual BOOL OnInitDialog();
afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
afx_msg void OnPaint();
afx_msg HCURSOR OnQueryDragIcon();
afx_msg void OnSelchangeMaintab(NMHDR* pNMHDR, LRESULT* pResult);
afx_msg void OnFileExit();
afx_msg void OnTimer(UINT nIDEvent);
afx_msg void OnFileStartserver();
afx_msg void OnFileStopserver();
afx_msg void OnStart();
afx_msg void OnClose();
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnHidesystray();
afx_msg void OnHide();
afx_msg void OnBlankRestore();
afx_msg LONG OnTrayNotify ( WPARAM wParam, LPARAM lParam );
afx_msg void OnDestroy();
afx_msg void OnFileEditconfiguration();
afx_msg void OnAboutHelp();
afx_msg void OnAboutCredits();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
......
......@@ -3,7 +3,7 @@
[Setup]
AppName=Icecast2 Win32
AppVerName=Icecast v2.2.0
AppVerName=Icecast v2.2.0_08112005
AppPublisherURL=http://www.icecast.org
AppSupportURL=http://www.icecast.org
AppUpdatesURL=http://www.icecast.org
......@@ -13,8 +13,9 @@ AllowNoIcons=yes
LicenseFile=..\COPYING
InfoAfterFile=..\README
OutputDir=.
OutputBaseFilename=icecast2_win32_2.2.0_setup
OutputBaseFilename=icecast2_win32_v2.2.0_08112005_setup
WizardImageFile=icecast2logo2.bmp
WizardImageStretch=no
; uncomment the following line if you want your installation to run on NT 3.51 too.
; MinVersion=4,3.51
......@@ -52,7 +53,7 @@ Source: "..\admin\manageauth.xsl"; DestDir: "{app}\admin"; Flags: ignoreversion
Source: "..\admin\updatemetadata.xsl"; DestDir: "{app}\admin"; Flags: ignoreversion
Source: "..\..\pthreads\pthreadVSE.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\conf\icecast.xml"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\conf\icecast_full.xml"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\conf\icecast_minimal.xml"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\conf\icecast_shoutcast_compat.xml"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\iconv\lib\iconv.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\libxslt\lib\libxslt.dll"; DestDir: "{app}"; Flags: ignoreversion
......
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by Icecast2win.rc
//
#define IDM_ABOUTBOX 0x0010
#define IDD_ABOUTBOX 100
#define IDS_ABOUTBOX 101
#define IDD_ICECAST2WIN_DIALOG 102
#define IDR_MAINFRAME 128
#define IDR_MENU1 132
#define IDB_BITMAP1 134
#define IDB_BITMAP2 135
#define IDI_R 141
#define IDI_G 142
#define IDI_ICON1 142
#define IDD_SERVERSTATUS 144
#define IDD_SSTATUS 145
#define IDD_CONFIGDIALOG 146
#define IDD_STATSDIALOG 147
#define IDB_BITMAP3 149
#define IDB_BITMAP4 150
#define IDB_BITMAP5 151
#define IDB_BITMAP6 152
#define IDR_MENU2 153
#define IDR_MENU3 154
#define IDC_CURSOR1 155
#define IDC_CURSOR2 156
#define IDB_BITMAP7 159
#define IDR_TRAY 160
#define IDR_MENU4 161
#define IDC_MAINTAB 1000
#define IDC_ERROR_EDIT 1003
#define IDC_ACCESS_EDIT 1004
#define IDC_CONFIG_EDIT 1006
#define IDC_SERVERSTATUS 1008
#define IDC_SOURCES_CONNECTED 1009
#define IDC_NUMBER_CLIENTS 1010
#define IDC_GROUP1 1011
#define IDC_STATS_EDIT 1012
#define IDC_CONFIG 1020
#define IDC_STATSLIST 1021
#define IDC_SOURCELIST 1022
#define IDC_START 1023
#define IDC_AUTOSTART 1024
#define IDC_FILLER1 1025
#define IDC_FILLER2 1026
#define IDC_STATIC_SS 1029
#define IDC_GLOBALSTAT_LIST 1030
#define IDC_STATIC_GS 1031
#define IDC_STATIC_SLS 1032
#define IDC_RUNNINGFOR 1033
#define IDC_STATIC_RUN 1034
#define IDC_STATICBLACK 1035
#define IDC_HIDESYSTRAY 1036
#define ID_FILE_STARTSERVER 32771
#define ID_FILE_EXIT 32772
#define ID_FILE_STOPSERVER 32774
#define ID_FILE 32775
#define ID_POPUP_ADDTOGLOBALSTATLIST 32776
#define ID__DELETEFROMGLOBALSTATS 32777
#define ID__MAKETHISSTATTHEWINDOWTITLE 32779
#define ID_BLANK_RESTORE 32780
#define ID_ABOUT_HELP 32781
#define ID_FILE_EDITCONFIGURATION 32782
#define ID_ABOUT_CREDITS 32784
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 162
#define _APS_NEXT_COMMAND_VALUE 32785
#define _APS_NEXT_CONTROL_VALUE 1037
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by Icecast2win.rc
//
#define IDM_ABOUTBOX 0x0010
#define IDD_ABOUTBOX 100
#define IDS_ABOUTBOX 101
#define IDD_ICECAST2WIN_DIALOG 102
#define IDR_MAINFRAME 128
#define IDR_MENU1 132
#define IDB_BITMAP1 134
#define IDB_BITMAP2 135
#define IDI_R 141
#define IDI_G 142
#define IDI_ICON1 142
#define IDD_SERVERSTATUS 144
#define IDD_SSTATUS 145
#define IDD_CONFIGDIALOG 146
#define IDD_STATSDIALOG 147
#define IDB_BITMAP3 149
#define IDB_BITMAP4 150
#define IDB_BITMAP5 151
#define IDB_BITMAP6 152
#define IDR_MENU2 153
#define IDR_MENU3 154
#define IDC_CURSOR1 155
#define IDC_CURSOR2 156
#define IDB_BITMAP7 159
#define IDR_TRAY 160
#define IDR_MENU4 161
#define IDB_BITMAP8 163
#define IDB_BITMAP9 164
#define IDC_MAINTAB 1000
#define IDC_ERROR_EDIT 1003
#define IDC_ACCESS_EDIT 1004
#define IDC_CONFIG_EDIT 1006
#define IDC_SERVERSTATUS 1008
#define IDC_SOURCES_CONNECTED 1009
#define IDC_NUMBER_CLIENTS 1010
#define IDC_GROUP1 1011
#define IDC_STATS_EDIT 1012
#define IDC_CONFIG 1020
#define IDC_STATSLIST 1021
#define IDC_SOURCELIST 1022
#define IDC_START 1023
#define IDC_AUTOSTART 1024
#define IDC_FILLER1 1025
#define IDC_FILLER2 1026
#define IDC_STATIC_SS 1029
#define IDC_GLOBALSTAT_LIST 1030
#define IDC_STATIC_GS 1031
#define IDC_STATIC_SLS 1032
#define IDC_RUNNINGFOR 1033
#define IDC_STATIC_RUN 1034
#define IDC_STATICBLACK 1035
#define IDC_HIDESYSTRAY 1036
#define ID_FILE_STARTSERVER 32771
#define ID_FILE_EXIT 32772
#define ID_FILE_STOPSERVER 32774
#define ID_FILE 32775
#define ID_POPUP_ADDTOGLOBALSTATLIST 32776
#define ID__DELETEFROMGLOBALSTATS 32777
#define ID__MAKETHISSTATTHEWINDOWTITLE 32779
#define ID_BLANK_RESTORE 32780
#define ID_ABOUT_HELP 32781
#define ID_FILE_EDITCONFIGURATION 32782
#define ID_ABOUT_CREDITS 32784
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 165
#define _APS_NEXT_COMMAND_VALUE 32785
#define _APS_NEXT_CONTROL_VALUE 1037
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment