Commit 02471ae6 authored by Ed "oddsock" Zaleski's avatar Ed "oddsock" Zaleski

Remove ResizableDialog logic from the UI due to possible license conflicts..

svn path=/icecast/trunk/icecast/; revision=8066
parent ead216d4
......@@ -66,7 +66,7 @@ BOOL CConfigTab::OnInitDialog()
CTabPageSSL::OnInitDialog();
// TODO: Add extra initialization here
AddAnchor(IDC_CONFIG, TOP_LEFT, BOTTOM_RIGHT);
// AddAnchor(IDC_CONFIG, TOP_LEFT, BOTTOM_RIGHT);
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
......
......@@ -15,7 +15,7 @@ Class3=CAboutDlg
ResourceCount=10
Resource1=IDD_SSTATUS
Resource2=IDR_MAINFRAME
Resource3=IDD_ABOUTBOX
Resource3=IDD_STATSDIALOG
Resource4=IDR_MENU2
Class4=CStatus
Resource5=IDR_TRAY
......@@ -25,7 +25,7 @@ Resource6=IDR_MENU4
Resource7=IDD_ICECAST2WIN_DIALOG
Resource8=IDD_CONFIGDIALOG
Resource9=IDR_MENU3
Resource10=IDD_STATSDIALOG
Resource10=IDD_ABOUTBOX
[CLS:CIcecast2winApp]
Type=0
......
......@@ -74,15 +74,14 @@ BEGIN
DEFPUSHBUTTON "OK",IDOK,178,7,50,14,WS_GROUP
END
IDD_ICECAST2WIN_DIALOG DIALOGEX 0, 0, 318, 249
IDD_ICECAST2WIN_DIALOG DIALOGEX 0, 0, 326, 259
STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_APPWINDOW
CAPTION "icecast2"
MENU IDR_MENU4
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "Tab1",IDC_MAINTAB,"SysTabControl32",0x0,0,48,318,201
CONTROL "Tab1",IDC_MAINTAB,"SysTabControl32",0x0,0,49,326,210
PUSHBUTTON "Start Server",IDC_START,17,31,56,14
CONTROL "Start Server on Application Startup",IDC_AUTOSTART,
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,76,
......@@ -92,8 +91,8 @@ BEGIN
WS_EX_CLIENTEDGE
CTEXT "Server Status",IDC_STATIC_SS,172,23,65,10,
SS_CENTERIMAGE
CONTROL 150,IDC_STATICBLACK,"Static",SS_BITMAP,116,0,200,20
PUSHBUTTON "Hide To Systray",IDC_HIDESYSTRAY,257,22,58,12
CONTROL 150,IDC_STATICBLACK,"Static",SS_BITMAP,116,0,214,20
PUSHBUTTON "Hide To Systray",IDC_HIDESYSTRAY,262,22,58,12
END
IDD_SSTATUS DIALOG DISCARDABLE 0, 0, 320, 210
......@@ -103,10 +102,10 @@ BEGIN
LTEXT "",IDC_FILLER2,0,199,319,11
CONTROL "List1",IDC_GLOBALSTAT_LIST,"SysListView32",LVS_REPORT |
WS_BORDER | WS_TABSTOP,9,34,300,147
CTEXT "Global Statistics",IDC_STATIC_GS,9,6,300,10
LTEXT "Server Has Been Running For ",IDC_STATIC_RUN,46,184,100,
LTEXT "Global Statistics",IDC_STATIC_GS,9,6,300,10
LTEXT "Server Has Been Running For ",IDC_STATIC_RUN,10,19,109,
8
LTEXT "",IDC_RUNNINGFOR,149,184,156,8
LTEXT "",IDC_RUNNINGFOR,121,19,156,8
END
IDD_CONFIGDIALOG DIALOG DISCARDABLE 0, 0, 320, 210
......@@ -122,11 +121,10 @@ STYLE WS_CHILD
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "List1",IDC_STATSLIST,"SysListView32",LVS_REPORT |
WS_BORDER | WS_TABSTOP,142,34,149,160
WS_BORDER | WS_TABSTOP,142,34,163,147
CONTROL "List2",IDC_SOURCELIST,"SysListView32",LVS_REPORT |
WS_BORDER | WS_TABSTOP,9,34,111,159
LTEXT "",IDC_FILLER1,0,199,320,11
CTEXT "Source Level Statistics",IDC_STATIC_SLS,9,7,300,10
WS_BORDER | WS_TABSTOP,9,34,111,147
LTEXT "Source Level Statistics",IDC_STATIC_SLS,9,7,300,10
LTEXT "Click source to view statistics",IDC_STATIC,18,25,111,8
END
......
......@@ -5,7 +5,6 @@
#include "Icecast2win.h"
#include "Icecast2winDlg.h"
#include <process.h>
#include "ResizableDialog.h"
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
......@@ -25,7 +24,6 @@ extern "C" {
#include "stats.h"
}
#include <afxinet.h>
#ifdef _DEBUG
......@@ -165,7 +163,7 @@ void RemoveFromAdditionalGlobalStats(CString source, CString name) {
/////////////////////////////////////////////////////////////////////////////
// CAboutDlg dialog used for App About
class CAboutDlg : public CResizableDialog
class CAboutDlg : public CDialog
{
public:
CAboutDlg();
......@@ -188,7 +186,7 @@ protected:
DECLARE_MESSAGE_MAP()
};
CAboutDlg::CAboutDlg() : CResizableDialog(CAboutDlg::IDD)
CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
{
//{{AFX_DATA_INIT(CAboutDlg)
//}}AFX_DATA_INIT
......@@ -196,12 +194,12 @@ CAboutDlg::CAboutDlg() : CResizableDialog(CAboutDlg::IDD)
void CAboutDlg::DoDataExchange(CDataExchange* pDX)
{
CResizableDialog::DoDataExchange(pDX);
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CAboutDlg)
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CAboutDlg, CResizableDialog)
BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
//{{AFX_MSG_MAP(CAboutDlg)
// No message handlers
//}}AFX_MSG_MAP
......@@ -212,7 +210,7 @@ END_MESSAGE_MAP()
// CIcecast2winDlg dialog
CIcecast2winDlg::CIcecast2winDlg(CWnd* pParent /*=NULL*/)
: CResizableDialog(CIcecast2winDlg::IDD, pParent)
: CDialog(CIcecast2winDlg::IDD, pParent)
{
//{{AFX_DATA_INIT(CIcecast2winDlg)
m_AccessEdit = _T("");
......@@ -231,7 +229,7 @@ CIcecast2winDlg::CIcecast2winDlg(CWnd* pParent /*=NULL*/)
void CIcecast2winDlg::DoDataExchange(CDataExchange* pDX)
{
CResizableDialog::DoDataExchange(pDX);
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CIcecast2winDlg)
DDX_Control(pDX, IDC_STATIC_SS, m_SS);
DDX_Control(pDX, IDC_SERVERSTATUS, m_ServerStatusBitmap);
......@@ -241,7 +239,7 @@ void CIcecast2winDlg::DoDataExchange(CDataExchange* pDX)
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CIcecast2winDlg, CResizableDialog)
BEGIN_MESSAGE_MAP(CIcecast2winDlg, CDialog)
//{{AFX_MSG_MAP(CIcecast2winDlg)
ON_WM_SYSCOMMAND()
ON_WM_PAINT()
......@@ -268,9 +266,10 @@ END_MESSAGE_MAP()
#include "colors.h"
BOOL CIcecast2winDlg::OnInitDialog()
{
CResizableDialog::OnInitDialog();
CDialog::OnInitDialog();
// Add "About..." menu item to system menu.
......@@ -290,7 +289,6 @@ BOOL CIcecast2winDlg::OnInitDialog()
}
}
g_mainDialog = this;
// Set the icon for this dialog. The framework does this automatically
......@@ -327,10 +325,10 @@ BOOL CIcecast2winDlg::OnInitDialog()
LoadConfig();
AddAnchor(IDC_MAINTAB, TOP_LEFT, BOTTOM_RIGHT);
AddAnchor(IDC_STATICBLACK, TOP_LEFT, TOP_RIGHT);
// AddAnchor(IDC_MAINTAB, TOP_LEFT, BOTTOM_RIGHT);
// AddAnchor(IDC_STATICBLACK, TOP_LEFT, TOP_RIGHT);
EnableSaveRestore("icecast2win", "positions");
// EnableSaveRestore("icecast2win", "positions");
m_pTray = NULL;
......@@ -354,7 +352,7 @@ void CIcecast2winDlg::OnSysCommand(UINT nID, LPARAM lParam)
}
else
{
CResizableDialog::OnSysCommand(nID, lParam);
CDialog::OnSysCommand(nID, lParam);
}
}
......@@ -383,7 +381,7 @@ void CIcecast2winDlg::OnPaint()
}
else
{
CResizableDialog::OnPaint();
CDialog::OnPaint();
}
}
......@@ -636,7 +634,7 @@ void CIcecast2winDlg::OnTimer(UINT nIDEvent)
}
}
CResizableDialog::OnTimer(nIDEvent);
CDialog::OnTimer(nIDEvent);
}
char g_configFile[1024] = "";
......@@ -984,7 +982,7 @@ void CIcecast2winDlg::config_read()
char buf[1024] = "";
CString tempString;
m_colSource0Width = GetPrivateProfileInt(gAppName, "col0SourceWidth", 150, gConfigFile);
m_colSource0Width = GetPrivateProfileInt(gAppName, "col0SourceWidth", 163, gConfigFile);
m_colStats0Width = GetPrivateProfileInt(gAppName, "col0StatsWidth", 100, gConfigFile);
m_colStats1Width = GetPrivateProfileInt(gAppName, "col1StatsWidth", 150, gConfigFile);
m_colGStats0Width = GetPrivateProfileInt(gAppName, "col0GStatsWidth", 150, gConfigFile);
......@@ -1038,12 +1036,12 @@ void CIcecast2winDlg::OnClose()
{
// TODO: Add your message handler code here and/or call default
config_write();
CResizableDialog::OnClose();
CDialog::OnClose();
}
void CIcecast2winDlg::OnSize(UINT nType, int cx, int cy)
{
CResizableDialog::OnSize(nType, cx, cy);
CDialog::OnSize(nType, cx, cy);
int border1 = 0;
int border2 = 78;
......@@ -1051,8 +1049,20 @@ void CIcecast2winDlg::OnSize(UINT nType, int cx, int cy)
if (m_MainTab.m_hWnd) {
CRect rect;
GetClientRect (&rect);
m_MainTab.ResizeDialog(0, rect.Width()-border1, rect.Height()-border2);
m_MainTab.ResizeDialog(1, rect.Width()-border1, rect.Height()-border2);
int x = rect.Width()-border1;
int y = rect.Width()-border2;
statusTab.SetWindowPos(NULL, 4, 22, cx, cy, SWP_NOZORDER);
statsTab.SetWindowPos(NULL, 4, 22, cx, cy, SWP_NOZORDER);
statusTab.m_GlobalStatList.SetWindowPos(NULL, 14, 55, cx-40, cy-180, SWP_NOZORDER);
statsTab.m_StatsListCtrl.SetWindowPos(NULL, 213, 55, cx-243, cy-180, SWP_NOZORDER);
statsTab.m_SourceListCtrl.SetWindowPos(NULL, 14, 55, 166, cy-180, SWP_NOZORDER);
// CListCtrl m_StatsListCtrl;
// CListCtrl m_SourceListCtrl;
m_MainTab.SetWindowPos(NULL, 0, 80, cx, cy, SWP_NOZORDER);
//m_MainTab.ResizeDialog(0, rect.Width()-border1, rect.Height()-border2);
//m_MainTab.ResizeDialog(1, rect.Width()-border1, rect.Height()-border2);
}
}
......@@ -1123,7 +1133,7 @@ void CIcecast2winDlg::OnBlankRestore()
void CIcecast2winDlg::OnDestroy()
{
CResizableDialog::OnDestroy();
CDialog::OnDestroy();
if (m_pTray) {
delete m_pTray ;
......
......@@ -4,7 +4,6 @@
#if !defined(AFX_ICECAST2WINDLG_H__23B4DA8B_C9BC_49C8_A62C_37FC6BC5E54A__INCLUDED_)
#define AFX_ICECAST2WINDLG_H__23B4DA8B_C9BC_49C8_A62C_37FC6BC5E54A__INCLUDED_
#include "ResizableDialog.h"
#include "TabCtrlSSL.h"
#include "TabPageSSL.h"
......@@ -20,7 +19,7 @@
/////////////////////////////////////////////////////////////////////////////
// CIcecast2winDlg dialog
class CIcecast2winDlg : public CResizableDialog
class CIcecast2winDlg : public CDialog
{
// Construction
public:
......
This diff is collapsed.
#if !defined(AFX_RESIZABLEDIALOG_H__INCLUDED_)
#define AFX_RESIZABLEDIALOG_H__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
// ResizableDialog.h : header file
//
/////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2000 by Paolo Messina
// (ppescher@yahoo.com)
//
// Free for non-commercial use.
// You may change the code to your needs,
// provided that credits to the original
// author is given in the modified files.
//
/////////////////////////////////////////////////////////////////////////////
#include <afxtempl.h>
#include <afxwin.h>
// useful compatibility constants (the only one required is NOANCHOR)
#if !defined(__SIZE_ANCHORS_)
#define __SIZE_ANCHORS_
const CSize
NOANCHOR(-1,-1),
TOP_LEFT(0,0), TOP_CENTER(50,0), TOP_RIGHT(100,0),
MIDDLE_LEFT(0,50), MIDDLE_CENTER(50,50), MIDDLE_RIGHT(100,50),
BOTTOM_LEFT(0,100), BOTTOM_CENTER(50,100), BOTTOM_RIGHT(100,100);
#endif // !defined(__SIZE_ANCHORS_)
/////////////////////////////////////////////////////////////////////////////
// CResizableDialog window
class CResizableDialog : public CDialog
{
// Construction
public:
CResizableDialog();
CResizableDialog(UINT nIDTemplate, CWnd* pParentWnd = NULL);
CResizableDialog(LPCTSTR lpszTemplateName, CWnd* pParentWnd = NULL);
// Attributes
private:
// flags
BOOL m_bShowGrip;
BOOL m_bUseMaxTrack;
BOOL m_bUseMinTrack;
BOOL m_bUseMaxRect;
BOOL m_bEnableSaveRestore;
// internal status
CString m_sSection; // section name and
CString m_sEntry; // entry for save/restore
BOOL m_bInitDone; // if all internal vars initialized
SIZE m_szGripSize; // set at construction time
CRect m_rcGripRect; // current pos of grip
POINT m_ptMinTrackSize; // min tracking size
POINT m_ptMaxTrackSize; // max tracking size
POINT m_ptMaxPos; // maximized position
POINT m_ptMaxSize; // maximized size
class Layout
{
public:
HWND hwnd;
BOOL adj_hscroll;
BOOL need_refresh;
// upper-left corner
CSize tl_type;
CSize tl_margin;
// bottom-right corner
CSize br_type;
CSize br_margin;
public:
Layout()
: hwnd(NULL), adj_hscroll(FALSE), need_refresh(FALSE),
tl_type(0,0), tl_margin(0,0),
br_type(0,0), br_margin(0,0)
{
};
Layout(HWND hw, SIZE tl_t, SIZE tl_m,
SIZE br_t, SIZE br_m, BOOL hscroll, BOOL refresh)
{
hwnd = hw;
adj_hscroll = hscroll;
need_refresh = refresh;
tl_type = tl_t;
tl_margin = tl_m;
br_type = br_t;
br_margin = br_m;
};
};
CArray<Layout, Layout&> m_arrLayout; // list of repositionable controls
// Operations
public:
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CResizableDialog)
//}}AFX_VIRTUAL
// Implementation
public:
virtual ~CResizableDialog();
// used internally
private:
void Construct();
void LoadWindowRect();
void SaveWindowRect();
void ArrangeLayout();
void UpdateGripPos();
// callable from derived classes
//protected:
public:
void AddAnchor(HWND wnd, CSize tl_type,
CSize br_type = NOANCHOR); // add anchors to a control
void AddAnchor(UINT ctrl_ID, CSize tl_type,
CSize br_type = NOANCHOR) // add anchors to a control
{
AddAnchor(::GetDlgItem(*this, ctrl_ID), tl_type, br_type);
};
void ShowSizeGrip(BOOL bShow); // show or hide the size grip
void SetMaximizedRect(const CRect& rc); // set window rect when maximized
void ResetMaximizedRect(); // reset to default maximized rect
void SetMinTrackSize(const CSize& size); // set minimum tracking size
void ResetMinTrackSize(); // reset to default minimum tracking size
void SetMaxTrackSize(const CSize& size); // set maximum tracking size
void ResetMaxTrackSize(); // reset to default maximum tracking size
void EnableSaveRestore(LPCTSTR pszSection, LPCTSTR pszEntry); // section and entry in app's profile
// Generated message map functions
protected:
//{{AFX_MSG(CResizableDialog)
virtual BOOL OnInitDialog();
afx_msg UINT OnNcHitTest(CPoint point);
afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI);
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnDestroy();
afx_msg void OnPaint();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
/////////////////////////////////////////////////////////////////////////////
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_RESIZABLEDIALOG_H__INCLUDED_)
\ No newline at end of file
......@@ -61,9 +61,9 @@ BOOL CStatsTab::OnInitDialog()
m_StatsListCtrl.InsertColumn(0, _T("Statistic"), LVCFMT_LEFT, m_colStats0Width);
m_StatsListCtrl.InsertColumn(1, _T("Value"), LVCFMT_LEFT, m_colStats1Width);
AddAnchor(IDC_STATSLIST, TOP_LEFT, BOTTOM_RIGHT);
AddAnchor(IDC_SOURCELIST, TOP_LEFT, BOTTOM_LEFT);
AddAnchor(IDC_FILLER1, BOTTOM_LEFT, BOTTOM_RIGHT);
// AddAnchor(IDC_STATSLIST, TOP_LEFT, BOTTOM_RIGHT);
// AddAnchor(IDC_SOURCELIST, TOP_LEFT, BOTTOM_LEFT);
// AddAnchor(IDC_FILLER1, BOTTOM_LEFT, BOTTOM_RIGHT);
m_SourceListCtrl.SetSelectionMark(0);
m_SLS.SetFont(&(g_mainDialog->labelFont), TRUE);
......
......@@ -65,10 +65,10 @@ BOOL CStatus::OnInitDialog()
m_GlobalStatList.SetExtendedStyle(LVS_EX_FULLROWSELECT);
// TODO: Add extra initialization here
AddAnchor(IDC_FILLER2, BOTTOM_LEFT, BOTTOM_RIGHT);
AddAnchor(IDC_GLOBALSTAT_LIST, TOP_LEFT, BOTTOM_RIGHT);
AddAnchor(IDC_STATIC_RUN, BOTTOM_LEFT, BOTTOM_RIGHT);
AddAnchor(IDC_RUNNINGFOR, BOTTOM_LEFT, BOTTOM_RIGHT);
// AddAnchor(IDC_FILLER2, BOTTOM_LEFT, BOTTOM_RIGHT);
// AddAnchor(IDC_GLOBALSTAT_LIST, TOP_LEFT, BOTTOM_RIGHT);
// AddAnchor(IDC_STATIC_RUN, BOTTOM_LEFT, BOTTOM_RIGHT);
// AddAnchor(IDC_RUNNINGFOR, BOTTOM_LEFT, BOTTOM_RIGHT);
m_GS.SetFont(&(g_mainDialog->labelFont), TRUE);
......
#include "stdafx.h"
#include "TabPageSSL.h"
#include "ResizableDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
......@@ -18,7 +17,7 @@ CTabPageSSL::CTabPageSSL () {
}
CTabPageSSL::CTabPageSSL (UINT nIDTemplate, CWnd* pParent /*=NULL*/)
: CResizableDialog(nIDTemplate, pParent) {
: CDialog(nIDTemplate, pParent) {
#ifndef _AFX_NO_OCC_SUPPORT
AfxEnableControlContainer ();
#endif // !_AFX_NO_OCC_SUPPORT
......@@ -47,7 +46,7 @@ void CTabPageSSL::OnCancel (void) {
BOOL CTabPageSSL::OnCommand (WPARAM wParam, LPARAM lParam) {
// Call base class OnCommand to allow message map processing
CResizableDialog::OnCommand (wParam, lParam);
CDialog::OnCommand (wParam, lParam);
//
// Forward WM_COMMAND messages to the dialog's parent.
//
......@@ -58,7 +57,7 @@ BOOL CTabPageSSL::OnNotify (WPARAM wParam, LPARAM lParam, LRESULT* pResult) {
//
// Forward WM_NOTIFY messages to the dialog's parent.
//
CResizableDialog::OnNotify (wParam, lParam, pResult);
CDialog::OnNotify (wParam, lParam, pResult);
return GetParent ()->SendMessage (WM_NOTIFY, wParam, lParam);
}
......@@ -72,5 +71,5 @@ BOOL CTabPageSSL::OnCmdMsg (UINT nID, int nCode, void* pExtra,
return GetParent ()->OnCmdMsg (nID, nCode, pExtra, pHandlerInfo);
#endif // !_AFX_NO_OCC_SUPPORT
return CResizableDialog::OnCmdMsg (nID, nCode, pExtra, pHandlerInfo);
return CDialog::OnCmdMsg (nID, nCode, pExtra, pHandlerInfo);
}
......@@ -3,9 +3,8 @@
/////////////////////////////////////////////////////////////////////////////
// CTabPageSSL declaration
#include "ResizableDialog.h"
class CTabPageSSL : public CResizableDialog
class CTabPageSSL : public CDialog
{
public:
// Construction
......
win32/black.bmp

28.2 KB | W: | H:

win32/black.bmp

151 KB | W: | H:

win32/black.bmp
win32/black.bmp
win32/black.bmp
win32/black.bmp
  • 2-up
  • Swipe
  • Onion skin
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