Skip to content
This repository has been archived by the owner on Sep 2, 2021. It is now read-only.

Add brackets icons #5

Merged
merged 4 commits into from
Jun 15, 2012
Merged

Add brackets icons #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9877bd5
Mac: add icons and trim down menus.
gruehle Jun 14, 2012
99d8778
Win: add brackets icons and remove unused resources.
gruehle Jun 14, 2012
eb8583a
Change 'Hide cefclient' to 'Hide Brackets'
gruehle Jun 15, 2012
15ffda8
Merge branch 'glenn/menus-and-icons' of github.com:adobe/brackets-she…
gruehle Jun 15, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Brackets.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 4 additions & 10 deletions appshell.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
8F03DB06DAEB3FCC64DBB7F8 /* stream_reader_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BE21DEA53CCCB6F82B61230 /* stream_reader_ctocpp.cc */; };
8FD55C97E1DE2A9B39F63205 /* domvisitor_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 60226CEE12BF2260A17F2328 /* domvisitor_cpptoc.cc */; };
9286827D87326B48CDA87B37 /* request_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = B5F6DEF7A5E722606EFDD579 /* request_handler_cpptoc.cc */; };
92D1A00BA8DD26C04841665A /* brackets.icns in Resources */ = {isa = PBXBuildFile; fileRef = 749E5239635519A330E75891 /* brackets.icns */; };
92FD20DDFF7CEB92E760C991 /* browser_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 380F6E9056AE039AA8A492DD /* browser_ctocpp.cc */; };
9832A7870C1EDCCCFF6C9DC4 /* scheme_handler_factory_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = D1DE62EC2EB883C39E54C7BA /* scheme_handler_factory_cpptoc.cc */; };
98D7CA892DCE9560817D8DA3 /* client_app.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C262FF082FED71CE8963FDD5 /* client_app.cpp */; };
Expand All @@ -105,7 +106,6 @@
C90FB710D7B25572E80BFD69 /* v8accessor_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 845EEC823278584B42AFB2B7 /* v8accessor_cpptoc.cc */; };
CF1EE9AEF2671F90918C896C /* brackets_extensions.js in Resources */ = {isa = PBXBuildFile; fileRef = F55C44F44BBA964EFE0B704F /* brackets_extensions.js */; };
D44993FFF44DE7241797A865 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 117371CDDB44775B39107AA8 /* AppKit.framework */; };
DB1186A70776CD627B4B42AE /* cefclient.icns in Resources */ = {isa = PBXBuildFile; fileRef = 7E44B655C022B8B96CA64796 /* cefclient.icns */; };
DDA2289823F976BECC01755A /* menu_model_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 86E19C99BCCDDA939F257FE0 /* menu_model_ctocpp.cc */; };
DFF56C4CCC0DF43679368430 /* response_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8637A80D02FB4C99759A9768 /* response_ctocpp.cc */; };
E1D8CE3AB1318012B1092D8C /* domevent_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3458504ADE6A6AF8C60A2C67 /* domevent_ctocpp.cc */; };
Expand Down Expand Up @@ -329,6 +329,7 @@
728F974FA38A31AFD1EBA1ED /* string_visitor_cpptoc.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = string_visitor_cpptoc.cc; sourceTree = "<group>"; };
73BD18BBE14A6CD1DE6E5E57 /* process_helper_mac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = process_helper_mac.cpp; sourceTree = "<group>"; };
73D701875C12409A5CB2C57A /* cef_v8.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_v8.h; sourceTree = "<group>"; };
749E5239635519A330E75891 /* brackets.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = brackets.icns; sourceTree = "<group>"; };
7590A687CA84D82F1AA48562 /* cookie_manager_ctocpp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cookie_manager_ctocpp.h; sourceTree = "<group>"; };
7644365DE7CC78D2DEA79A85 /* domnode_ctocpp.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = domnode_ctocpp.cc; sourceTree = "<group>"; };
766C178896B6E02C18859DCF /* cef_resource_handler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_resource_handler.h; sourceTree = "<group>"; };
Expand All @@ -337,7 +338,6 @@
7A23EBE1C5CFE1625F63FD57 /* cef_context_menu_handler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_context_menu_handler.h; sourceTree = "<group>"; };
7B1F678D2890FCB53A883C89 /* cef_stream_capi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_stream_capi.h; sourceTree = "<group>"; };
7D96382DCC9DC64414EC6E05 /* string_util.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = string_util.cpp; sourceTree = "<group>"; };
7E44B655C022B8B96CA64796 /* cefclient.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = cefclient.icns; sourceTree = "<group>"; };
7E9FDC3988B247C56F392E33 /* cef_string.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_string.h; sourceTree = "<group>"; };
7FC6441C12E0D2D5C46FFFE2 /* cef_byte_read_handler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_byte_read_handler.h; sourceTree = "<group>"; };
80CBC98C4853A36252F42EF2 /* cef_values_capi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_values_capi.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -559,7 +559,7 @@
ADAED968E71A7516652B8254 /* Info.plist */,
AB557E135D18D071AA200048 /* InfoPlist.strings */,
EDDE848ADF50901E338C0DE5 /* MainMenu.xib */,
7E44B655C022B8B96CA64796 /* cefclient.icns */,
749E5239635519A330E75891 /* brackets.icns */,
);
path = mac;
sourceTree = "<group>";
Expand Down Expand Up @@ -991,7 +991,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
DB1186A70776CD627B4B42AE /* cefclient.icns in Resources */,
92D1A00BA8DD26C04841665A /* brackets.icns in Resources */,
EB4A35C3C60BE898F8FB7EC6 /* InfoPlist.strings in Resources */,
6B295097B29E8FB628815A1B /* MainMenu.xib in Resources */,
CF1EE9AEF2671F90918C896C /* brackets_extensions.js in Resources */,
Expand Down Expand Up @@ -1297,7 +1297,6 @@
"\"ENABLE_ONE_CLICK_SIGNIN\"",
"\"ENABLE_REMOTING=1\"",
"\"ENABLE_WEBRTC=1\"",
"\"ENABLE_P2P_APIS=1\"",
"\"ENABLE_CONFIGURATION_POLICY\"",
"\"ENABLE_INPUT_SPEECH\"",
"\"ENABLE_NOTIFICATIONS\"",
Expand Down Expand Up @@ -1386,7 +1385,6 @@
"\"ENABLE_ONE_CLICK_SIGNIN\"",
"\"ENABLE_REMOTING=1\"",
"\"ENABLE_WEBRTC=1\"",
"\"ENABLE_P2P_APIS=1\"",
"\"ENABLE_CONFIGURATION_POLICY\"",
"\"ENABLE_INPUT_SPEECH\"",
"\"ENABLE_NOTIFICATIONS\"",
Expand Down Expand Up @@ -1459,7 +1457,6 @@
"\"ENABLE_ONE_CLICK_SIGNIN\"",
"\"ENABLE_REMOTING=1\"",
"\"ENABLE_WEBRTC=1\"",
"\"ENABLE_P2P_APIS=1\"",
"\"ENABLE_CONFIGURATION_POLICY\"",
"\"ENABLE_INPUT_SPEECH\"",
"\"ENABLE_NOTIFICATIONS\"",
Expand Down Expand Up @@ -1537,7 +1534,6 @@
"\"ENABLE_ONE_CLICK_SIGNIN\"",
"\"ENABLE_REMOTING=1\"",
"\"ENABLE_WEBRTC=1\"",
"\"ENABLE_P2P_APIS=1\"",
"\"ENABLE_CONFIGURATION_POLICY\"",
"\"ENABLE_INPUT_SPEECH\"",
"\"ENABLE_NOTIFICATIONS\"",
Expand Down Expand Up @@ -1627,7 +1623,6 @@
"\"ENABLE_ONE_CLICK_SIGNIN\"",
"\"ENABLE_REMOTING=1\"",
"\"ENABLE_WEBRTC=1\"",
"\"ENABLE_P2P_APIS=1\"",
"\"ENABLE_CONFIGURATION_POLICY\"",
"\"ENABLE_INPUT_SPEECH\"",
"\"ENABLE_NOTIFICATIONS\"",
Expand Down Expand Up @@ -1715,7 +1710,6 @@
"\"ENABLE_ONE_CLICK_SIGNIN\"",
"\"ENABLE_REMOTING=1\"",
"\"ENABLE_WEBRTC=1\"",
"\"ENABLE_P2P_APIS=1\"",
"\"ENABLE_CONFIGURATION_POLICY\"",
"\"ENABLE_INPUT_SPEECH\"",
"\"ENABLE_NOTIFICATIONS\"",
Expand Down
3 changes: 1 addition & 2 deletions appshell/cefclient.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ IDS_BRACKETS_EXTENSIONS BINARY "brackets_extensions.js"

// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_CEFCLIENT ICON "res\cefclient.ico"
IDI_SMALL ICON "res\small.ico"
IDI_CEFCLIENT ICON "res\brackets.ico"

/////////////////////////////////////////////////////////////////////////////
//
Expand Down
4 changes: 4 additions & 0 deletions appshell/cefclient_mac.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,10 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification {
int main(int argc, char* argv[]) {
CefMainArgs main_args(argc, argv);

// Delete Special Characters Palette from Edit menu.
[[NSUserDefaults standardUserDefaults]
setBool:YES forKey:@"NSDisabledCharacterPaletteMenuItem"];

g_appStartupTime = CFAbsoluteTimeGetCurrent();

CefRefPtr<ClientApp> app(new ClientApp);
Expand Down
Loading