Subversion Repositories Code-Repo

Compare Revisions

No changes between revisions

Ignore whitespace Rev 346 → Rev 347

/Misc Projects/PcMarlinInterface/Icon.rc
0,0 → 1,0
IDI_ICON1 ICON DISCARDABLE "Resources\Icon.ico"
/Misc Projects/PcMarlinInterface/MacroController.cpp
37,6 → 37,7
connect(sigMapper, SIGNAL(mapped(QWidget*)), this, SLOT(Macro_InitTransmit(QWidget*)));
 
setWindowTitle("Macro Settings");
setWindowIcon(QIcon(":/External/Resources/Icon_16.bmp"));
}
 
MacroController::~MacroController()
/Misc Projects/PcMarlinInterface/MainWindow.cpp
102,6 → 102,7
Serial_Disconnected();
 
setWindowTitle("Marlin Controller");
setWindowIcon(QIcon(":/External/Resources/Icon_16.bmp"));
}
 
MainWindow::~MainWindow()
/Misc Projects/PcMarlinInterface/PcMarlinInterface.pro
21,3 → 21,7
MainWindow.h \
SerialController.h \
MacroController.h
 
RESOURCES += Resources.qrc
 
RC_FILE = Icon.rc
/Misc Projects/PcMarlinInterface/PcMarlinInterface.pro.user
1,6 → 1,6
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.3.0, 2015-01-03T05:42:38. -->
<!-- Written by QtCreator 3.3.0, 2015-01-03T20:08:30. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
/Misc Projects/PcMarlinInterface/Resources/Icon.ico
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Misc Projects/PcMarlinInterface/Resources/Icon.ico
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/Misc Projects/PcMarlinInterface/Resources/Icon_16.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Misc Projects/PcMarlinInterface/Resources/Icon_16.bmp
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/Misc Projects/PcMarlinInterface/Resources/Icon_32.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Misc Projects/PcMarlinInterface/Resources/Icon_32.bmp
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/Misc Projects/PcMarlinInterface/Resources/Icon_64.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Misc Projects/PcMarlinInterface/Resources/Icon_64.bmp
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/Misc Projects/PcMarlinInterface/Resources.qrc
0,0 → 1,7
<RCC>
<qresource prefix="/External">
<file>Resources/Icon_16.bmp</file>
<file>Resources/Icon_32.bmp</file>
<file>Resources/Icon_64.bmp</file>
</qresource>
</RCC>