diff --git a/common/lc_global.cpp b/common/lc_global.cpp index ea2880db..fb748d74 100644 --- a/common/lc_global.cpp +++ b/common/lc_global.cpp @@ -1 +1 @@ -#include "common/lc_global.h" +#include "lc_global.h" diff --git a/common/lc_mainwindow.cpp b/common/lc_mainwindow.cpp index 61e539c3..5497aab1 100644 --- a/common/lc_mainwindow.cpp +++ b/common/lc_mainwindow.cpp @@ -115,28 +115,107 @@ void lcMainWindow::CreateActions() mActions[LC_FILE_OPEN]->setToolTip(tr("Open Project")); mActions[LC_FILE_SAVE]->setToolTip(tr("Save Project")); - mActions[LC_FILE_NEW]->setIcon(QIcon(":/resources/file_new.png")); - mActions[LC_FILE_OPEN]->setIcon(QIcon(":/resources/file_open.png")); - mActions[LC_FILE_SAVE]->setIcon(QIcon(":/resources/file_save.png")); - mActions[LC_FILE_SAVE_IMAGE]->setIcon(QIcon(":/resources/file_picture.png")); - mActions[LC_FILE_PRINT]->setIcon(QIcon(":/resources/file_print.png")); - mActions[LC_FILE_PRINT_PREVIEW]->setIcon(QIcon(":/resources/file_print_preview.png")); - mActions[LC_EDIT_UNDO]->setIcon(QIcon(":/resources/edit_undo.png")); - mActions[LC_EDIT_REDO]->setIcon(QIcon(":/resources/edit_redo.png")); - mActions[LC_EDIT_CUT]->setIcon(QIcon(":/resources/edit_cut.png")); - mActions[LC_EDIT_COPY]->setIcon(QIcon(":/resources/edit_copy.png")); - mActions[LC_EDIT_PASTE]->setIcon(QIcon(":/resources/edit_paste.png")); - mActions[LC_EDIT_ACTION_INSERT]->setIcon(QIcon(":/resources/action_insert.png")); - mActions[LC_EDIT_ACTION_LIGHT]->setIcon(QIcon(":/resources/action_light.png")); - mActions[LC_EDIT_ACTION_SPOTLIGHT]->setIcon(QIcon(":/resources/action_spotlight.png")); + QIcon FileNewIcon; + FileNewIcon.addFile(":/resources/file_new.png"); + FileNewIcon.addFile(":/resources/file_new_16.png"); + mActions[LC_FILE_NEW]->setIcon(FileNewIcon); + + QIcon FileSaveIcon; + FileSaveIcon.addFile(":/resources/file_save.png"); + FileSaveIcon.addFile(":/resources/file_save_16.png"); + mActions[LC_FILE_SAVE]->setIcon(FileSaveIcon); + + QIcon FileOpenIcon; + FileOpenIcon.addFile(":/resources/file_open.png"); + FileOpenIcon.addFile(":/resources/file_open_16.png"); + mActions[LC_FILE_OPEN]->setIcon(FileOpenIcon); + + QIcon FilePrintIcon; + FilePrintIcon.addFile(":/resources/file_print.png"); + FilePrintIcon.addFile(":/resources/file_print_16.png"); + mActions[LC_FILE_PRINT]->setIcon(FilePrintIcon); + + QIcon FilePrintPreviewIcon; + FilePrintPreviewIcon.addFile(":/resources/file_print_preview.png"); + FilePrintPreviewIcon.addFile(":/resources/file_print_preview_16.png"); + mActions[LC_FILE_PRINT_PREVIEW]->setIcon(FilePrintPreviewIcon); + + QIcon EditUndoIcon; + EditUndoIcon.addFile(":/resources/edit_undo.png"); + EditUndoIcon.addFile(":/resources/edit_undo_16.png"); + mActions[LC_EDIT_UNDO]->setIcon(EditUndoIcon); + + QIcon EditRedoIcon; + EditRedoIcon.addFile(":/resources/edit_redo.png"); + EditRedoIcon.addFile(":/resources/edit_redo_16.png"); + mActions[LC_EDIT_REDO]->setIcon(EditRedoIcon); + + QIcon EditCutIcon; + EditCutIcon.addFile(":/resources/edit_cut.png"); + EditCutIcon.addFile(":/resources/edit_cut_16.png"); + mActions[LC_EDIT_CUT]->setIcon(EditCutIcon); + + QIcon EditCopyIcon; + EditCopyIcon.addFile(":/resources/edit_copy.png"); + EditCopyIcon.addFile(":/resources/edit_copy_16.png"); + mActions[LC_EDIT_COPY]->setIcon(EditCopyIcon); + + QIcon EditPasteIcon; + EditPasteIcon.addFile(":/resources/edit_paste.png"); + EditPasteIcon.addFile(":/resources/edit_paste_16.png"); + mActions[LC_EDIT_PASTE]->setIcon(EditPasteIcon); + + QIcon EditActionInsertIcon; + EditActionInsertIcon.addFile(":/resources/action_insert.png"); + EditActionInsertIcon.addFile(":/resources/action_insert_16.png"); + mActions[LC_EDIT_ACTION_INSERT]->setIcon(EditActionInsertIcon); + + QIcon EditActionLightIcon; + EditActionLightIcon.addFile(":/resources/action_light.png"); + EditActionLightIcon.addFile(":/resources/action_light_16.png"); + mActions[LC_EDIT_ACTION_LIGHT]->setIcon(EditActionLightIcon); + + QIcon EditActionSpotLightIcon; + EditActionSpotLightIcon.addFile(":/resources/action_spotlight.png"); + EditActionSpotLightIcon.addFile(":/resources/action_spotlight_16.png"); + mActions[LC_EDIT_ACTION_SPOTLIGHT]->setIcon(EditActionSpotLightIcon); + + QIcon EditActionSelectIcon; + EditActionSelectIcon.addFile(":/resources/action_select.png"); + EditActionSelectIcon.addFile(":/resources/action_select_16.png"); + mActions[LC_EDIT_ACTION_SELECT]->setIcon(EditActionSelectIcon); + + QIcon EditActionMoveIcon; + EditActionMoveIcon.addFile(":/resources/action_move.png"); + EditActionMoveIcon.addFile(":/resources/action_move_16.png"); + mActions[LC_EDIT_ACTION_MOVE]->setIcon(EditActionMoveIcon); + + QIcon EditActionRotateIcon; + EditActionRotateIcon.addFile(":/resources/action_rotate.png"); + EditActionRotateIcon.addFile(":/resources/action_rotate_16.png"); + mActions[LC_EDIT_ACTION_ROTATE]->setIcon(EditActionRotateIcon); + + QIcon EditActionDeleteIcon; + EditActionDeleteIcon.addFile(":/resources/action_delete.png"); + EditActionDeleteIcon.addFile(":/resources/action_delete_16.png"); + mActions[LC_EDIT_ACTION_DELETE]->setIcon(EditActionDeleteIcon); + + QIcon EditActionPaintIcon; + EditActionPaintIcon.addFile(":/resources/action_paint.png"); + EditActionPaintIcon.addFile(":/resources/action_paint_16.png"); + mActions[LC_EDIT_ACTION_PAINT]->setIcon(EditActionPaintIcon); + + QIcon EditActionZoomIcon; + EditActionZoomIcon.addFile(":/resources/action_zoom.png"); + EditActionZoomIcon.addFile(":/resources/action_zoom_16.png"); + mActions[LC_EDIT_ACTION_ZOOM]->setIcon(EditActionZoomIcon); + + QIcon EditActionPanIcon; + EditActionPanIcon.addFile(":/resources/action_pan.png"); + EditActionPanIcon.addFile(":/resources/action_pan_16.png"); + mActions[LC_EDIT_ACTION_PAN]->setIcon(EditActionPanIcon); + mActions[LC_EDIT_ACTION_CAMERA]->setIcon(QIcon(":/resources/action_camera.png")); - mActions[LC_EDIT_ACTION_SELECT]->setIcon(QIcon(":/resources/action_select.png")); - mActions[LC_EDIT_ACTION_MOVE]->setIcon(QIcon(":/resources/action_move.png")); - mActions[LC_EDIT_ACTION_ROTATE]->setIcon(QIcon(":/resources/action_rotate.png")); - mActions[LC_EDIT_ACTION_DELETE]->setIcon(QIcon(":/resources/action_delete.png")); - mActions[LC_EDIT_ACTION_PAINT]->setIcon(QIcon(":/resources/action_paint.png")); - mActions[LC_EDIT_ACTION_ZOOM]->setIcon(QIcon(":/resources/action_zoom.png")); - mActions[LC_EDIT_ACTION_PAN]->setIcon(QIcon(":/resources/action_pan.png")); mActions[LC_EDIT_ACTION_ROTATE_VIEW]->setIcon(QIcon(":/resources/action_rotate_view.png")); mActions[LC_EDIT_ACTION_ROLL]->setIcon(QIcon(":/resources/action_roll.png")); mActions[LC_EDIT_ACTION_ZOOM_REGION]->setIcon(QIcon(":/resources/action_zoom_region.png")); @@ -279,6 +358,8 @@ void lcMainWindow::CreateMenus() EditMenu->addAction(mActions[LC_EDIT_PASTE]); EditMenu->addSeparator(); EditMenu->addAction(mActions[LC_EDIT_FIND]); + + mActions[LC_EDIT_FIND]->setIcon(QIcon(":/resources/edit_find.png")); EditMenu->addAction(mActions[LC_EDIT_FIND_NEXT]); EditMenu->addAction(mActions[LC_EDIT_FIND_PREVIOUS]); EditMenu->addSeparator(); @@ -435,6 +516,8 @@ void lcMainWindow::CreateToolBars() QHBoxLayout* TransformLayout = new QHBoxLayout; QWidget* TransformWidget = new QWidget(); TransformWidget->setLayout(TransformLayout); + + TransformLayout->setContentsMargins(5, 0, 5, 0); mTransformXEdit = new QLineEdit(); mTransformXEdit->setMaximumWidth(75); TransformLayout->addWidget(mTransformXEdit); diff --git a/leocad.pro b/leocad.pro index ba09a9bf..5fab3b70 100644 --- a/leocad.pro +++ b/leocad.pro @@ -8,7 +8,7 @@ greaterThan(QT_MAJOR_VERSION, 4) { INCLUDEPATH += qt common CONFIG += precompile_header incremental c++11 -PRECOMPILED_HEADER = common/lc_global.h +PRECOMPILED_HEADER = lc_global.h win32 { QMAKE_CXXFLAGS_WARN_ON += -wd4100 DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_DEPRECATE=1 _CRT_NONSTDC_NO_WARNINGS=1 diff --git a/leocad.qrc b/leocad.qrc index 9bc18824..06cd703b 100644 --- a/leocad.qrc +++ b/leocad.qrc @@ -1,5 +1,25 @@ + resources/action_delete_16.png + resources/action_insert_16.png + resources/action_light_16.png + resources/action_move_16.png + resources/action_paint_16.png + resources/action_pan_16.png + resources/action_rotate_16.png + resources/action_select_16.png + resources/action_spotlight_16.png + resources/action_zoom_16.png + resources/edit_copy_16.png + resources/edit_cut_16.png + resources/edit_paste_16.png + resources/edit_redo_16.png + resources/edit_undo_16.png + resources/file_new_16.png + resources/file_open_16.png + resources/file_print_16.png + resources/file_print_preview_16.png + resources/file_save_16.png resources/action_camera.png resources/action_delete.png resources/action_insert.png @@ -36,6 +56,7 @@ resources/cursor_zoom_region.png resources/edit_copy.png resources/edit_cut.png + resources/edit_find.png resources/edit_lock.png resources/edit_paste.png resources/edit_redo.png diff --git a/resources/action_camera.png b/resources/action_camera.png index 2612c962..0091c8e1 100644 Binary files a/resources/action_camera.png and b/resources/action_camera.png differ diff --git a/resources/action_delete.png b/resources/action_delete.png index 0def7281..1f1a2552 100644 Binary files a/resources/action_delete.png and b/resources/action_delete.png differ diff --git a/resources/action_delete_16.png b/resources/action_delete_16.png new file mode 100644 index 00000000..f2eca21b Binary files /dev/null and b/resources/action_delete_16.png differ diff --git a/resources/action_insert.png b/resources/action_insert.png index 9498a4da..810b648d 100644 Binary files a/resources/action_insert.png and b/resources/action_insert.png differ diff --git a/resources/action_insert_16.png b/resources/action_insert_16.png new file mode 100644 index 00000000..16ae9e3b Binary files /dev/null and b/resources/action_insert_16.png differ diff --git a/resources/action_light.png b/resources/action_light.png index d3c6eea3..0db445e6 100644 Binary files a/resources/action_light.png and b/resources/action_light.png differ diff --git a/resources/action_light_16.png b/resources/action_light_16.png new file mode 100644 index 00000000..b7277c59 Binary files /dev/null and b/resources/action_light_16.png differ diff --git a/resources/action_move.png b/resources/action_move.png index 25986902..f08c4426 100644 Binary files a/resources/action_move.png and b/resources/action_move.png differ diff --git a/resources/action_move_16.png b/resources/action_move_16.png new file mode 100644 index 00000000..95d25f29 Binary files /dev/null and b/resources/action_move_16.png differ diff --git a/resources/action_next.png b/resources/action_next.png index 389df568..6b9c4b49 100644 Binary files a/resources/action_next.png and b/resources/action_next.png differ diff --git a/resources/action_paint.png b/resources/action_paint.png index fded645d..d6b0b471 100644 Binary files a/resources/action_paint.png and b/resources/action_paint.png differ diff --git a/resources/action_paint_16.png b/resources/action_paint_16.png new file mode 100644 index 00000000..947b8a5e Binary files /dev/null and b/resources/action_paint_16.png differ diff --git a/resources/action_pan.png b/resources/action_pan.png index 697bb96f..b3cdc974 100644 Binary files a/resources/action_pan.png and b/resources/action_pan.png differ diff --git a/resources/action_pan_16.png b/resources/action_pan_16.png new file mode 100644 index 00000000..d73c5490 Binary files /dev/null and b/resources/action_pan_16.png differ diff --git a/resources/action_previous.png b/resources/action_previous.png index f2f9b537..9bbb32b8 100644 Binary files a/resources/action_previous.png and b/resources/action_previous.png differ diff --git a/resources/action_roll.png b/resources/action_roll.png index 6d88bd85..b7445196 100644 Binary files a/resources/action_roll.png and b/resources/action_roll.png differ diff --git a/resources/action_rotate.png b/resources/action_rotate.png index e80c7085..0b52455a 100644 Binary files a/resources/action_rotate.png and b/resources/action_rotate.png differ diff --git a/resources/action_rotate_16.png b/resources/action_rotate_16.png new file mode 100644 index 00000000..01ec3e68 Binary files /dev/null and b/resources/action_rotate_16.png differ diff --git a/resources/action_rotate_view.png b/resources/action_rotate_view.png index ad37ed46..53aa3663 100644 Binary files a/resources/action_rotate_view.png and b/resources/action_rotate_view.png differ diff --git a/resources/action_select.png b/resources/action_select.png index 4459d935..974806cf 100644 Binary files a/resources/action_select.png and b/resources/action_select.png differ diff --git a/resources/action_select_16.png b/resources/action_select_16.png new file mode 100644 index 00000000..b1bd9f04 Binary files /dev/null and b/resources/action_select_16.png differ diff --git a/resources/action_spotlight.png b/resources/action_spotlight.png index 32677681..4b691417 100644 Binary files a/resources/action_spotlight.png and b/resources/action_spotlight.png differ diff --git a/resources/action_spotlight_16.png b/resources/action_spotlight_16.png new file mode 100644 index 00000000..a75d51bf Binary files /dev/null and b/resources/action_spotlight_16.png differ diff --git a/resources/action_zoom.png b/resources/action_zoom.png index d2e7b550..8cc5d15a 100644 Binary files a/resources/action_zoom.png and b/resources/action_zoom.png differ diff --git a/resources/action_zoom_16.png b/resources/action_zoom_16.png new file mode 100644 index 00000000..ef48de07 Binary files /dev/null and b/resources/action_zoom_16.png differ diff --git a/resources/action_zoom_region.png b/resources/action_zoom_region.png index eda25f39..e638bcd1 100644 Binary files a/resources/action_zoom_region.png and b/resources/action_zoom_region.png differ diff --git a/resources/cursor_zoom.png b/resources/cursor_zoom.png index 895e08d1..a94aa62f 100644 Binary files a/resources/cursor_zoom.png and b/resources/cursor_zoom.png differ diff --git a/resources/edit_copy.png b/resources/edit_copy.png index 76280984..39537eca 100644 Binary files a/resources/edit_copy.png and b/resources/edit_copy.png differ diff --git a/resources/edit_copy_16.png b/resources/edit_copy_16.png new file mode 100644 index 00000000..b035e40d Binary files /dev/null and b/resources/edit_copy_16.png differ diff --git a/resources/edit_cut.png b/resources/edit_cut.png index 81d74bcc..fa155048 100644 Binary files a/resources/edit_cut.png and b/resources/edit_cut.png differ diff --git a/resources/edit_cut_16.png b/resources/edit_cut_16.png new file mode 100644 index 00000000..56938012 Binary files /dev/null and b/resources/edit_cut_16.png differ diff --git a/resources/edit_find.png b/resources/edit_find.png new file mode 100644 index 00000000..967f9b83 Binary files /dev/null and b/resources/edit_find.png differ diff --git a/resources/edit_lock.png b/resources/edit_lock.png index 45db51d4..a4cd3f1a 100644 Binary files a/resources/edit_lock.png and b/resources/edit_lock.png differ diff --git a/resources/edit_paste.png b/resources/edit_paste.png index 395bec93..78ec72c9 100644 Binary files a/resources/edit_paste.png and b/resources/edit_paste.png differ diff --git a/resources/edit_paste_16.png b/resources/edit_paste_16.png new file mode 100644 index 00000000..fa1d1116 Binary files /dev/null and b/resources/edit_paste_16.png differ diff --git a/resources/edit_redo.png b/resources/edit_redo.png index 896eb720..33d16ed6 100644 Binary files a/resources/edit_redo.png and b/resources/edit_redo.png differ diff --git a/resources/edit_redo_16.png b/resources/edit_redo_16.png new file mode 100644 index 00000000..d5f9061b Binary files /dev/null and b/resources/edit_redo_16.png differ diff --git a/resources/edit_snap_angle.png b/resources/edit_snap_angle.png index 9bcdb9ea..ae4dc682 100644 Binary files a/resources/edit_snap_angle.png and b/resources/edit_snap_angle.png differ diff --git a/resources/edit_snap_move.png b/resources/edit_snap_move.png index 0b66eede..10a49e86 100644 Binary files a/resources/edit_snap_move.png and b/resources/edit_snap_move.png differ diff --git a/resources/edit_transform_absolute_rotation.png b/resources/edit_transform_absolute_rotation.png index 5a24d6e9..01a7ca87 100644 Binary files a/resources/edit_transform_absolute_rotation.png and b/resources/edit_transform_absolute_rotation.png differ diff --git a/resources/edit_transform_absolute_translation.png b/resources/edit_transform_absolute_translation.png index 847d5787..5455b906 100644 Binary files a/resources/edit_transform_absolute_translation.png and b/resources/edit_transform_absolute_translation.png differ diff --git a/resources/edit_transform_relative.png b/resources/edit_transform_relative.png index 0dd63139..d7afe3e9 100644 Binary files a/resources/edit_transform_relative.png and b/resources/edit_transform_relative.png differ diff --git a/resources/edit_transform_relative_rotation.png b/resources/edit_transform_relative_rotation.png index c85ab854..68ad8030 100644 Binary files a/resources/edit_transform_relative_rotation.png and b/resources/edit_transform_relative_rotation.png differ diff --git a/resources/edit_transform_relative_translation.png b/resources/edit_transform_relative_translation.png index 727b3f90..7a1fbf20 100644 Binary files a/resources/edit_transform_relative_translation.png and b/resources/edit_transform_relative_translation.png differ diff --git a/resources/edit_undo.png b/resources/edit_undo.png index eb94d702..1a14720e 100644 Binary files a/resources/edit_undo.png and b/resources/edit_undo.png differ diff --git a/resources/edit_undo_16.png b/resources/edit_undo_16.png new file mode 100644 index 00000000..3babbdb9 Binary files /dev/null and b/resources/edit_undo_16.png differ diff --git a/resources/file_new.png b/resources/file_new.png index f74f846b..1c200631 100644 Binary files a/resources/file_new.png and b/resources/file_new.png differ diff --git a/resources/file_new_16.png b/resources/file_new_16.png new file mode 100644 index 00000000..0087894d Binary files /dev/null and b/resources/file_new_16.png differ diff --git a/resources/file_open.png b/resources/file_open.png index df6491cb..fed17a96 100644 Binary files a/resources/file_open.png and b/resources/file_open.png differ diff --git a/resources/file_open_16.png b/resources/file_open_16.png new file mode 100644 index 00000000..755a02ed Binary files /dev/null and b/resources/file_open_16.png differ diff --git a/resources/file_picture.png b/resources/file_picture.png index e74df30a..c65a554d 100644 Binary files a/resources/file_picture.png and b/resources/file_picture.png differ diff --git a/resources/file_print.png b/resources/file_print.png index c30e02a6..b8e1d24e 100644 Binary files a/resources/file_print.png and b/resources/file_print.png differ diff --git a/resources/file_print_16.png b/resources/file_print_16.png new file mode 100644 index 00000000..176cb3c6 Binary files /dev/null and b/resources/file_print_16.png differ diff --git a/resources/file_print_preview.png b/resources/file_print_preview.png index 83c2e772..690c543f 100644 Binary files a/resources/file_print_preview.png and b/resources/file_print_preview.png differ diff --git a/resources/file_print_preview_16.png b/resources/file_print_preview_16.png new file mode 100644 index 00000000..0c809ffc Binary files /dev/null and b/resources/file_print_preview_16.png differ diff --git a/resources/file_save.png b/resources/file_save.png index fa54ee20..ce3014c8 100644 Binary files a/resources/file_save.png and b/resources/file_save.png differ diff --git a/resources/file_save_16.png b/resources/file_save_16.png new file mode 100644 index 00000000..dc07726f Binary files /dev/null and b/resources/file_save_16.png differ diff --git a/resources/help_email.png b/resources/help_email.png index debaa30f..ba3bfc41 100644 Binary files a/resources/help_email.png and b/resources/help_email.png differ diff --git a/resources/help_homepage.png b/resources/help_homepage.png index 9aacc0f2..5dcf73fc 100644 Binary files a/resources/help_homepage.png and b/resources/help_homepage.png differ diff --git a/resources/piece_show_earlier.png b/resources/piece_show_earlier.png index b0aded37..d14414df 100644 Binary files a/resources/piece_show_earlier.png and b/resources/piece_show_earlier.png differ diff --git a/resources/piece_show_later.png b/resources/piece_show_later.png index 0cb2c818..86e32c03 100644 Binary files a/resources/piece_show_later.png and b/resources/piece_show_later.png differ diff --git a/resources/time_add_keys.png b/resources/time_add_keys.png index 9a07dfee..c6c836b7 100644 Binary files a/resources/time_add_keys.png and b/resources/time_add_keys.png differ diff --git a/resources/time_first.png b/resources/time_first.png index 71260205..20d5e354 100644 Binary files a/resources/time_first.png and b/resources/time_first.png differ diff --git a/resources/time_last.png b/resources/time_last.png index 258237e1..9348d69a 100644 Binary files a/resources/time_last.png and b/resources/time_last.png differ diff --git a/resources/time_next.png b/resources/time_next.png index 8ac68351..9e9d96c0 100644 Binary files a/resources/time_next.png and b/resources/time_next.png differ diff --git a/resources/time_previous.png b/resources/time_previous.png index bfbd63a5..c5c10fb9 100644 Binary files a/resources/time_previous.png and b/resources/time_previous.png differ diff --git a/resources/view_split_horizontal.png b/resources/view_split_horizontal.png index bb9a0315..7c76b251 100644 Binary files a/resources/view_split_horizontal.png and b/resources/view_split_horizontal.png differ diff --git a/resources/view_split_vertical.png b/resources/view_split_vertical.png index 40c64595..d2abdc5d 100644 Binary files a/resources/view_split_vertical.png and b/resources/view_split_vertical.png differ diff --git a/resources/view_zoomextents.png b/resources/view_zoomextents.png index 6dd50952..1fa258da 100644 Binary files a/resources/view_zoomextents.png and b/resources/view_zoomextents.png differ