diff --git a/guix_studio/ReadMe.txt b/guix_studio/README.txt similarity index 100% rename from guix_studio/ReadMe.txt rename to guix_studio/README.txt diff --git a/guix_studio/build/vs_2019/studiox.vcxproj b/guix_studio/build/vs_2019/studiox.vcxproj index db5039bf..83158c17 100644 --- a/guix_studio/build/vs_2019/studiox.vcxproj +++ b/guix_studio/build/vs_2019/studiox.vcxproj @@ -171,7 +171,6 @@ - @@ -302,7 +301,6 @@ - diff --git a/guix_studio/build/vs_2019/studiox.vcxproj.filters b/guix_studio/build/vs_2019/studiox.vcxproj.filters index 9934f210..1fa49f56 100644 --- a/guix_studio/build/vs_2019/studiox.vcxproj.filters +++ b/guix_studio/build/vs_2019/studiox.vcxproj.filters @@ -364,9 +364,6 @@ include - - include - include @@ -755,9 +752,6 @@ source - - source - source diff --git a/guix_studio/install_dir_dialog.cpp b/guix_studio/install_dir_dialog.cpp deleted file mode 100644 index 80d7b8cd..00000000 --- a/guix_studio/install_dir_dialog.cpp +++ /dev/null @@ -1,141 +0,0 @@ -// color_edit_dialog.cpp : implementation file -// - -#include "studiox_includes.h" -#include "install_dir_dialog.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#endif - -TCHAR default_samples_path[] = _T("C:\\Azure_RTOS\\GUIX-Studio-6.1"); - -BEGIN_MESSAGE_MAP(install_dir_dialog, express_dialog) - ON_BN_CLICKED(IDC_BROWSE, OnSetDirectory) - ON_BN_CLICKED(IDOK, OnOK) -END_MESSAGE_MAP() - - -IMPLEMENT_DYNAMIC(install_dir_dialog, express_dialog) - -extern INI_INFO StudioXIni; - -/////////////////////////////////////////////////////////////////////////////// -install_dir_dialog::install_dir_dialog(CWnd *parent) - : express_dialog(install_dir_dialog::IDD, parent) -{ - IconId = IDB_WARNING; - SetTitleText(CString("Select GUIX Studio Example Location")); - - StudioXIni.samples_dir = default_samples_path; - - /* Configure an initial, default "recent project" */ -} - -/////////////////////////////////////////////////////////////////////////////// -BOOL install_dir_dialog::OnInitDialog() -{ - express_dialog::OnInitDialog(); - - // TODO: Add extra initialization here - //AddCancelButton(); - AddSaveButton(CString("Continue")); - - CStatic* path_view = (CStatic*)GetDlgItem(IDC_INSTALL_PATH); - - if (path_view) - { - path_view->SetWindowText(default_samples_path); - } - return TRUE; // return TRUE unless you set the focus to a control - // EXCEPTION: OCX Property Pages should return FALSE -} - -/////////////////////////////////////////////////////////////////////////////// -void install_dir_dialog::OnSetDirectory() -{ - TCHAR path[MAX_PATH]; - CString test_project; - - if (BrowseForFolder(this->GetSafeHwnd(), _T("Select install directory.."), default_samples_path, path)) - { - CStatic *path_view = (CStatic*)GetDlgItem(IDC_INSTALL_PATH); - - if (path_view) - { - path_view->SetWindowText(path); - } - StudioXIni.samples_dir = path; - StudioXIni.samples_dir.MakeLower(); - } -} - -/////////////////////////////////////////////////////////////////////////////// -void install_dir_dialog::CopyInstalledObjects() -{ - // if no .ini file, this is our first run. Copy resources and sample project from package - // to installation directory - - WCHAR CopyFrom[255] = _T("Hello"); - CString install_folder = GetStudioInstallFolder(); - TCHAR CopyTo[255]; - SHFILEOPSTRUCT shfile; - int iRes; - - // copy default project to app data folder - wcscpy(CopyFrom, install_folder); - -#if defined(_DEBUG) - wcscat(CopyFrom, _T("\\studio_package_project\\samples\\demo_guix_simple\\*.*|")); -#else - wcscat(CopyFrom, _T("\\samples\\demo_guix_simple\\*.*|")); -#endif - - // Replace the '|' sign with null to get double-terminated string - - while (TCHAR* ptr = _tcsrchr(CopyFrom, _T('|'))) { - *ptr = _T('\0'); - } - - wcscpy(CopyTo, GetSamplesDir()); - wcscat(CopyTo, _T("\\sample\\demo_guix_simple")); - - // Fill the SHFILEOPSTRUCT struct - shfile.hwnd = NULL; - shfile.wFunc = FO_COPY; - shfile.pFrom = CopyFrom; - shfile.pTo = CopyTo; - shfile.fFlags = FOF_NOCONFIRMATION | FOF_NOCONFIRMMKDIR | FOF_NOERRORUI | FOF_SILENT; - - // Copy the eample project - iRes = SHFileOperation(&shfile); -} - -/////////////////////////////////////////////////////////////////////////////// -void install_dir_dialog::ConfigureDefaultSamplesDir(void) -{ - // Copy package resources to install dir - - CString samples_dir = GetSamplesDir(); - - // Make sure the directory exists - MakePath(samples_dir); - CopyInstalledObjects(); - - samples_dir = GetSamplesDir(); - samples_dir += "\\sample"; - samples_dir.MakeLower(); - samples_dir += _T("\\demo_guix_simple\\guix_simple.gxp"); - AddRecentProject(samples_dir); -} - - -/////////////////////////////////////////////////////////////////////////////// -void install_dir_dialog::OnOK() -{ - if (!GetSamplesDir().IsEmpty()) - { - ConfigureDefaultSamplesDir(); - } - CDialog::OnOK(); -} \ No newline at end of file diff --git a/guix_studio/install_dir_dialog.h b/guix_studio/install_dir_dialog.h deleted file mode 100644 index dda2924c..00000000 --- a/guix_studio/install_dir_dialog.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -// clone repo dialog -#include "studiox_includes.h" -#include "afxwin.h" -#include "afxcmn.h" - - -class install_dir_dialog : public express_dialog -{ - DECLARE_DYNAMIC(install_dir_dialog) - -public: - install_dir_dialog(CWnd *parent); - virtual BOOL OnInitDialog(); - -// Dialog Data - enum { IDD = IDD_SELECT_INSTALL_DIR }; - -protected: - DECLARE_MESSAGE_MAP() - afx_msg void OnOK(); - afx_msg void OnSetDirectory(); - - - -private: - void ConfigureDefaultSamplesDir(void); - void CopyInstalledObjects(); - -}; diff --git a/guix_studio/installer/Readme.txt b/guix_studio/installer/README.txt similarity index 100% rename from guix_studio/installer/Readme.txt rename to guix_studio/installer/README.txt diff --git a/guix_studio/libs/freetype/Readme.txt b/guix_studio/libs/freetype/README.txt similarity index 100% rename from guix_studio/libs/freetype/Readme.txt rename to guix_studio/libs/freetype/README.txt diff --git a/guix_studio/libs/libgit2/Readme.txt b/guix_studio/libs/libgit2/README.txt similarity index 100% rename from guix_studio/libs/libgit2/Readme.txt rename to guix_studio/libs/libgit2/README.txt diff --git a/guix_studio/libs/libjpeg/Readme.txt b/guix_studio/libs/libjpeg/README.txt similarity index 100% rename from guix_studio/libs/libjpeg/Readme.txt rename to guix_studio/libs/libjpeg/README.txt diff --git a/guix_studio/libs/libpng/Readme.txt b/guix_studio/libs/libpng/README.txt similarity index 100% rename from guix_studio/libs/libpng/Readme.txt rename to guix_studio/libs/libpng/README.txt diff --git a/guix_studio/resource.h b/guix_studio/resource.h index df5f3bc8..f3d86664 100644 --- a/guix_studio/resource.h +++ b/guix_studio/resource.h @@ -168,7 +168,6 @@ #define IDB_ADD_RESOURCE_HIGHLIGHT 306 #define IDD_RICH_TEXT_EDIT_DLG 307 #define IDD_CLONE_REPO 308 -#define IDD_SELECT_INSTALL_DIR 309 #define IDD_GIT_PROGRESS 310 #define IDB_BITMAP3 312 #define IDB_BOLD 315 @@ -427,7 +426,6 @@ #define IDB_CANCEL_CLONE 1257 #define IDB_CLONE_REPO3 1257 #define IDB_EXIT_CLONE_DIALOG 1257 -#define IDC_INSTALL_PATH 1258 #define IDC_ROTATION_ANGLE_LABLE 1260 #define IDC_ROTATION_ANGLE_COMBO 1261 #define IDC_CLONE_OPERATION 1262 diff --git a/guix_studio/studiox.rc b/guix_studio/studiox.rc index f889acc5..c581ddb2 100644 --- a/guix_studio/studiox.rc +++ b/guix_studio/studiox.rc @@ -1159,16 +1159,6 @@ BEGIN PUSHBUTTON "I do not want to download samples at this time.",IDB_EXIT_CLONE_DIALOG,7,86,340,17,BS_CENTER | BS_NOTIFY END -IDD_SELECT_INSTALL_DIR DIALOGEX 0, 0, 387, 134 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_SYSMENU -FONT 8, "Microsoft Sans Serif", 400, 0, 0x0 -BEGIN - LTEXT "GUIX Studio will install a simple example project to the following location. Click Continue to use the default location or click Browse to select a different location.",IDC_STATIC,32,33,311,27 - LTEXT "Installation Directory:",IDC_STATIC,9,60,83,10 - PUSHBUTTON "Browse...",IDC_BROWSE,331,72,49,16 - LTEXT "C:\\Azure_RTOS\\GUIX-Studio-6.1",IDC_INSTALL_PATH,6,72,322,16,SS_CENTERIMAGE | SS_SUNKEN | SS_ENDELLIPSIS -END - IDD_GIT_PROGRESS DIALOGEX 0, 0, 317, 90 STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE FONT 9, "Microsoft Sans Serif", 400, 0, 0x0 @@ -1457,14 +1447,6 @@ BEGIN BOTTOMMARGIN, 125 END - IDD_SELECT_INSTALL_DIR, DIALOG - BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 380 - TOPMARGIN, 7 - BOTTOMMARGIN, 127 - END - IDD_GIT_PROGRESS, DIALOG BEGIN LEFTMARGIN, 7 @@ -1607,11 +1589,6 @@ BEGIN 0 END -IDD_SELECT_INSTALL_DIR AFX_DIALOG_LAYOUT -BEGIN - 0 -END - IDD_GIT_PROGRESS AFX_DIALOG_LAYOUT BEGIN 0 diff --git a/guix_studio/target_view.cpp b/guix_studio/target_view.cpp index e79d76c0..b4d4bfe4 100644 --- a/guix_studio/target_view.cpp +++ b/guix_studio/target_view.cpp @@ -5,7 +5,6 @@ #include "target_view.h" #include "studiox_util.h" #include "clone_repo_dialog.h" -#include "install_dir_dialog.h" #include "color_edit_dialog.h" #ifdef _DEBUG @@ -172,13 +171,6 @@ void target_view::InitialDisplay(void) clone_repo_dialog *dlg = new clone_repo_dialog(parent); dlg->DoModal(); delete(dlg); - - if (StudioXIni.samples_dir.IsEmpty()) - { - install_dir_dialog *install_dlg = new install_dir_dialog(parent); - install_dlg->DoModal(); - delete install_dlg; - } } DisplayRecentProjects(); } diff --git a/test/example_internal/display_resolution/readme.txt b/test/example_internal/display_resolution/README.txt similarity index 100% rename from test/example_internal/display_resolution/readme.txt rename to test/example_internal/display_resolution/README.txt diff --git a/test/guix_studio_test/test_demo/readme.txt b/test/guix_studio_test/test_demo/README.txt similarity index 100% rename from test/guix_studio_test/test_demo/readme.txt rename to test/guix_studio_test/test_demo/README.txt