From ed5e2ca7a85799084f8aac2bacfec3cd267bf738 Mon Sep 17 00:00:00 2001 From: Passw Date: Sat, 27 Dec 2025 10:48:34 +0800 Subject: [PATCH] fix comments retroshare-gui/src/ retroshare-gui/src/TorControl/ retroshare-gui/src/Unused/ retroshare-gui/src/gui/ retroshare-gui/src/gui/WikiPoos/ retroshare-gui/src/gui/connect/ retroshare-gui/src/gui/elastic/ retroshare-gui/src/gui/feeds/ retroshare-gui/src/gui/gxs/ retroshare-gui/src/gui/help/ retroshare-gui/src/gui/msgs/ retroshare-gui/src/gui/plugins/ retroshare-gui/src/gui/profile/ retroshare-gui/src/gui/settings/ retroshare-gui/src/gui/statistics/ retroshare-gui/src/gui/statusbar/ retroshare-gui/src/gui/style/ retroshare-gui/src/gui/toaster/ retroshare-gui/src/gui/unfinished/ retroshare-gui/src/idle/ retroshare-gui/src/main.cpp retroshare-gui/src/retroshare-gui.pro retroshare-gui/src/retroshare-gui/ retroshare-gui/src/util/ --- .../src/TorControl/TorControlWindow.h | 2 + retroshare-gui/src/gui/AboutDialog.cpp | 2 +- retroshare-gui/src/gui/AboutDialog.h | 2 +- retroshare-gui/src/gui/AboutWidget.cpp | 12 +- retroshare-gui/src/gui/AboutWidget.h | 4 +- retroshare-gui/src/gui/ChatLobbyWidget.cpp | 70 +++++------ retroshare-gui/src/gui/ChatLobbyWidget.h | 4 +- .../src/gui/FriendServerControl.cpp | 2 +- retroshare-gui/src/gui/FriendServerControl.h | 2 +- retroshare-gui/src/gui/FriendsDialog.cpp | 2 +- retroshare-gui/src/gui/FriendsDialog.h | 6 +- retroshare-gui/src/gui/GenCertDialog.cpp | 8 +- retroshare-gui/src/gui/GenCertDialog.h | 2 +- retroshare-gui/src/gui/GetStartedDialog.cpp | 6 +- retroshare-gui/src/gui/GetStartedDialog.h | 2 +- retroshare-gui/src/gui/HelpDialog.cpp | 2 +- retroshare-gui/src/gui/HelpDialog.h | 4 +- retroshare-gui/src/gui/HomePage.cpp | 2 +- retroshare-gui/src/gui/HomePage.h | 2 +- .../src/gui/Identity/IdDetailsDialog.h | 2 +- retroshare-gui/src/gui/LogoBar.cpp | 4 +- retroshare-gui/src/gui/LogoBar.h | 14 +-- retroshare-gui/src/gui/MainPage.cpp | 4 +- retroshare-gui/src/gui/MainWindow.cpp | 6 +- retroshare-gui/src/gui/MainWindow.h | 8 +- retroshare-gui/src/gui/MessengerWindow.cpp | 6 +- retroshare-gui/src/gui/MessengerWindow.h | 2 +- retroshare-gui/src/gui/NetworkDialog.cpp | 6 +- retroshare-gui/src/gui/NetworkDialog.h | 4 +- .../gui/NetworkDialog/pgpid_item_proxy.cpp | 2 +- retroshare-gui/src/gui/NetworkView.cpp | 8 +- retroshare-gui/src/gui/NetworkView.h | 4 +- retroshare-gui/src/gui/NewsFeed.cpp | 4 +- retroshare-gui/src/gui/NewsFeed.h | 2 +- retroshare-gui/src/gui/People/CircleItem.cpp | 4 +- retroshare-gui/src/gui/People/CircleItem.h | 2 +- .../src/gui/People/CircleWidget.cpp | 10 +- retroshare-gui/src/gui/People/IdentityItem.h | 2 +- .../src/gui/People/PeopleDialog.cpp | 40 +++--- .../src/gui/PhotoShare/AlbumDialog.cpp | 2 +- .../src/gui/PhotoShare/AlbumGroupDialog.cpp | 6 +- .../src/gui/PhotoShare/PhotoDrop.cpp | 28 ++--- retroshare-gui/src/gui/PluginManager.cpp | 60 ++++----- retroshare-gui/src/gui/PluginManager.h | 10 +- .../src/gui/PluginManagerWidget.cpp | 34 ++--- retroshare-gui/src/gui/PluginManagerWidget.h | 14 +-- retroshare-gui/src/gui/PluginsPage.cpp | 14 +-- retroshare-gui/src/gui/PluginsPage.h | 2 +- retroshare-gui/src/gui/Posted/PhotoView.cpp | 18 +-- .../src/gui/Posted/PostedGroupDialog.cpp | 4 +- retroshare-gui/src/gui/QuickStartWizard.cpp | 32 ++--- retroshare-gui/src/gui/QuickStartWizard.h | 14 +-- .../src/gui/RSHumanReadableDelegate.h | 26 ++-- retroshare-gui/src/gui/RemoteDirModel.cpp | 8 +- retroshare-gui/src/gui/RemoteDirModel.h | 4 +- retroshare-gui/src/gui/RetroShareLink.cpp | 2 +- retroshare-gui/src/gui/RetroShareLink.h | 2 +- retroshare-gui/src/gui/RsAutoUpdatePage.cpp | 2 +- retroshare-gui/src/gui/RsGUIEventManager.cpp | 2 +- retroshare-gui/src/gui/RsGUIEventManager.h | 2 +- retroshare-gui/src/gui/SearchTreeWidget.cpp | 4 +- retroshare-gui/src/gui/SearchTreeWidget.h | 6 +- .../src/gui/ServicePermissionDialog.cpp | 4 +- .../src/gui/ServicePermissionDialog.h | 2 +- retroshare-gui/src/gui/ShareManager.cpp | 2 +- retroshare-gui/src/gui/ShareManager.h | 2 +- retroshare-gui/src/gui/SoundManager.cpp | 2 +- retroshare-gui/src/gui/SoundManager.h | 2 +- retroshare-gui/src/gui/StartDialog.cpp | 4 +- retroshare-gui/src/gui/StartDialog.h | 2 +- .../src/gui/TheWire/CustomFrame.cpp | 2 +- retroshare-gui/src/gui/TheWire/CustomFrame.h | 2 +- .../src/gui/TheWire/PulseAddDialog.cpp | 6 +- .../src/gui/TheWire/PulseAddDialog.h | 2 +- .../src/gui/TheWire/PulseMessage.cpp | 2 +- retroshare-gui/src/gui/TheWire/PulseMessage.h | 4 +- retroshare-gui/src/gui/TheWire/PulseReply.cpp | 4 +- retroshare-gui/src/gui/TheWire/PulseReply.h | 4 +- .../src/gui/TheWire/PulseReplySeperator.cpp | 2 +- .../src/gui/TheWire/PulseReplySeperator.h | 2 +- .../src/gui/TheWire/PulseTopLevel.cpp | 6 +- .../src/gui/TheWire/PulseTopLevel.h | 4 +- .../src/gui/TheWire/PulseViewGroup.cpp | 2 +- .../src/gui/TheWire/PulseViewGroup.h | 2 +- .../src/gui/TheWire/PulseViewItem.cpp | 8 +- .../src/gui/TheWire/PulseViewItem.h | 6 +- retroshare-gui/src/gui/TheWire/WireDialog.cpp | 12 +- retroshare-gui/src/gui/TheWire/WireDialog.h | 2 +- .../src/gui/TheWire/WireGroupDialog.cpp | 4 +- .../src/gui/TheWire/WireGroupDialog.h | 2 +- .../src/gui/TheWire/WireGroupExtra.cpp | 2 +- .../src/gui/TheWire/WireGroupItem.cpp | 6 +- .../src/gui/TheWire/WireGroupItem.h | 2 +- retroshare-gui/src/gui/TrustView.h | 2 + .../src/gui/WikiPoos/WikiAddDialog.cpp | 4 +- .../src/gui/WikiPoos/WikiAddDialog.h | 2 +- retroshare-gui/src/gui/WikiPoos/WikiDialog.h | 2 +- .../src/gui/WikiPoos/WikiEditDialog.cpp | 22 ++-- .../src/gui/WikiPoos/WikiEditDialog.h | 2 +- .../src/gui/connect/ConfCertDialog.cpp | 2 +- .../src/gui/connect/ConfCertDialog.h | 2 +- .../src/gui/connect/ConnectFriendWizard.cpp | 26 ++-- .../src/gui/connect/ConnectFriendWizard.h | 2 +- .../src/gui/connect/ConnectProgressDialog.cpp | 2 +- .../src/gui/connect/ConnectProgressDialog.h | 2 +- .../src/gui/connect/FriendRecommendDialog.cpp | 2 +- .../src/gui/connect/FriendRecommendDialog.h | 2 +- .../src/gui/connect/PGPKeyDialog.cpp | 2 +- retroshare-gui/src/gui/connect/PGPKeyDialog.h | 2 +- retroshare-gui/src/gui/elastic/arrow.cpp | 6 +- retroshare-gui/src/gui/elastic/arrow.h | 6 +- retroshare-gui/src/gui/elastic/edge.cpp | 6 +- retroshare-gui/src/gui/elastic/elnode.cpp | 2 +- retroshare-gui/src/gui/elastic/elnode.h | 2 +- retroshare-gui/src/gui/elastic/fft.h | 22 ++-- .../src/gui/elastic/graphwidget.cpp | 8 +- retroshare-gui/src/gui/elastic/graphwidget.h | 2 +- .../src/gui/feeds/AttachFileItem.cpp | 14 +-- retroshare-gui/src/gui/feeds/AttachFileItem.h | 2 +- .../src/gui/feeds/BoardsCommentsItem.cpp | 8 +- .../src/gui/feeds/BoardsCommentsItem.h | 2 +- .../src/gui/feeds/BoardsPostItem.cpp | 4 +- retroshare-gui/src/gui/feeds/BoardsPostItem.h | 4 +- .../src/gui/feeds/ChannelsCommentsItem.h | 4 +- retroshare-gui/src/gui/feeds/ChatMsgItem.cpp | 10 +- retroshare-gui/src/gui/feeds/ChatMsgItem.h | 2 +- retroshare-gui/src/gui/feeds/FeedHolder.cpp | 2 +- retroshare-gui/src/gui/feeds/FeedHolder.h | 2 +- retroshare-gui/src/gui/feeds/FeedItem.cpp | 2 +- retroshare-gui/src/gui/feeds/FeedItem.h | 2 +- .../src/gui/feeds/GxsChannelGroupItem.cpp | 2 +- .../src/gui/feeds/GxsChannelGroupItem.h | 4 +- .../src/gui/feeds/GxsChannelPostItem.cpp | 18 +-- .../src/gui/feeds/GxsChannelPostItem.h | 4 +- .../src/gui/feeds/GxsCircleItem.cpp | 4 +- retroshare-gui/src/gui/feeds/GxsCircleItem.h | 2 +- retroshare-gui/src/gui/feeds/GxsFeedItem.cpp | 2 +- retroshare-gui/src/gui/feeds/GxsFeedItem.h | 2 +- .../src/gui/feeds/GxsForumGroupItem.cpp | 2 +- .../src/gui/feeds/GxsForumGroupItem.h | 4 +- .../src/gui/feeds/GxsForumMsgItem.cpp | 2 +- .../src/gui/feeds/GxsForumMsgItem.h | 4 +- .../src/gui/feeds/GxsGroupFeedItem.cpp | 2 +- .../src/gui/feeds/GxsGroupFeedItem.h | 2 +- retroshare-gui/src/gui/feeds/MsgItem.cpp | 10 +- retroshare-gui/src/gui/feeds/MsgItem.h | 2 +- .../src/gui/feeds/NewsFeedUserNotify.cpp | 2 +- .../src/gui/feeds/NewsFeedUserNotify.h | 2 +- retroshare-gui/src/gui/feeds/PeerItem.cpp | 4 +- retroshare-gui/src/gui/feeds/PeerItem.h | 4 +- .../src/gui/feeds/PostedGroupItem.cpp | 4 +- .../src/gui/feeds/PostedGroupItem.h | 4 +- .../src/gui/feeds/SecurityIpItem.cpp | 2 +- retroshare-gui/src/gui/feeds/SecurityIpItem.h | 4 +- retroshare-gui/src/gui/feeds/SecurityItem.cpp | 8 +- retroshare-gui/src/gui/feeds/SecurityItem.h | 2 +- retroshare-gui/src/gui/feeds/SubFileItem.cpp | 16 +-- retroshare-gui/src/gui/feeds/SubFileItem.h | 2 +- .../src/gui/gxs/GxsCircleChooser.cpp | 8 +- .../src/gui/gxs/GxsCommentDialog.cpp | 18 +-- retroshare-gui/src/gui/gxs/GxsCommentDialog.h | 2 +- .../src/gui/gxs/GxsCreateCommentDialog.h | 4 +- retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp | 46 +++---- retroshare-gui/src/gui/gxs/GxsGroupDialog.h | 2 +- .../src/gui/gxs/GxsGroupShareKey.cpp | 8 +- .../src/gui/gxs/WikiGroupDialog.cpp | 2 +- .../gui/gxschannels/GxsChannelGroupDialog.cpp | 6 +- .../src/gui/gxsforums/GxsForumGroupDialog.cpp | 12 +- .../src/gui/gxsforums/GxsForumsDialog.h | 2 +- .../src/gui/help/browser/helpbrowser.cpp | 48 +++---- .../src/gui/help/browser/helpbrowser.h | 6 +- .../src/gui/help/browser/helptextbrowser.h | 2 +- retroshare-gui/src/gui/linetypes.h | 2 +- retroshare-gui/src/gui/mainpagestack.cpp | 2 +- retroshare-gui/src/gui/mainpagestack.h | 6 +- retroshare-gui/src/gui/msgs/MessageComposer.h | 8 +- .../src/gui/msgs/MessageInterface.h | 2 +- retroshare-gui/src/gui/msgs/MessageWindow.cpp | 4 +- .../src/gui/msgs/MessagesDialog.cpp | 10 +- retroshare-gui/src/gui/msgs/MessagesDialog.h | 6 +- retroshare-gui/src/gui/msgs/textformat.h | 4 +- .../src/gui/plugins/PluginInterface.h | 6 +- .../src/gui/profile/StatusMessage.cpp | 4 +- retroshare-gui/src/gui/settings/AboutPage.cpp | 2 +- retroshare-gui/src/gui/settings/AboutPage.h | 2 +- .../gui/settings/AddFileAssociationDialog.cpp | 2 +- .../gui/settings/AddFileAssociationDialog.h | 4 +- .../src/gui/settings/AppearancePage.cpp | 6 +- .../src/gui/settings/ChannelPage.cpp | 4 +- retroshare-gui/src/gui/settings/ChannelPage.h | 4 +- retroshare-gui/src/gui/settings/ChatPage.cpp | 2 +- retroshare-gui/src/gui/settings/ChatPage.h | 2 +- .../src/gui/settings/CryptoPage.cpp | 8 +- retroshare-gui/src/gui/settings/CryptoPage.h | 2 +- .../src/gui/settings/FileAssociationsPage.cpp | 2 +- .../src/gui/settings/FileAssociationsPage.h | 2 +- retroshare-gui/src/gui/settings/ForumPage.cpp | 2 +- retroshare-gui/src/gui/settings/ForumPage.h | 2 +- .../src/gui/settings/GeneralPage.cpp | 2 +- retroshare-gui/src/gui/settings/GeneralPage.h | 2 +- .../gui/settings/GroupFrameSettingsWidget.cpp | 2 +- .../gui/settings/GroupFrameSettingsWidget.h | 2 +- .../src/gui/settings/JsonApiPage.cc | 2 +- retroshare-gui/src/gui/settings/JsonApiPage.h | 2 +- .../src/gui/settings/MessagePage.cpp | 2 +- retroshare-gui/src/gui/settings/MessagePage.h | 2 +- retroshare-gui/src/gui/settings/NewTag.cpp | 2 +- retroshare-gui/src/gui/settings/NewTag.h | 4 +- .../src/gui/settings/NotifyPage.cpp | 2 +- retroshare-gui/src/gui/settings/NotifyPage.h | 2 +- .../src/gui/settings/PeoplePage.cpp | 2 +- .../src/gui/settings/PluginItem.cpp | 10 +- .../src/gui/settings/PluginsPage.cpp | 2 +- retroshare-gui/src/gui/settings/PluginsPage.h | 2 +- .../src/gui/settings/PostedPage.cpp | 2 +- .../gui/settings/RSPermissionMatrixWidget.cpp | 2 +- .../gui/settings/RSPermissionMatrixWidget.h | 2 +- .../src/gui/settings/RsharePeerSettings.cpp | 2 +- .../src/gui/settings/RsharePeerSettings.h | 2 +- .../src/gui/settings/ServerPage.cpp | 2 +- retroshare-gui/src/gui/settings/ServerPage.h | 2 +- .../gui/settings/ServicePermissionsPage.cpp | 2 +- .../src/gui/settings/ServicePermissionsPage.h | 2 +- retroshare-gui/src/gui/settings/SoundPage.cpp | 2 +- retroshare-gui/src/gui/settings/SoundPage.h | 2 +- .../src/gui/settings/TransferPage.cpp | 2 +- .../src/gui/settings/TransferPage.h | 2 +- retroshare-gui/src/gui/settings/WebuiPage.cpp | 2 +- retroshare-gui/src/gui/settings/WebuiPage.h | 2 +- retroshare-gui/src/gui/settings/rsettings.cpp | 2 +- retroshare-gui/src/gui/settings/rsettings.h | 4 +- .../src/gui/settings/rsettingswin.cpp | 2 +- .../src/gui/settings/rsettingswin.h | 2 +- .../src/gui/settings/rsharesettings.cpp | 18 +-- .../src/gui/settings/rsharesettings.h | 4 +- retroshare-gui/src/gui/statistics/BWGraph.cpp | 2 +- retroshare-gui/src/gui/statistics/BWGraph.h | 2 +- .../gui/statistics/BandwidthGraphWindow.cpp | 12 +- .../src/gui/statistics/BandwidthGraphWindow.h | 2 +- .../gui/statistics/BandwidthStatsWidget.cpp | 2 +- .../src/gui/statistics/BandwidthStatsWidget.h | 2 +- .../src/gui/statistics/BwCtrlWindow.cpp | 20 +-- .../src/gui/statistics/BwCtrlWindow.h | 2 +- .../src/gui/statistics/DhtWindow.cpp | 62 ++++----- retroshare-gui/src/gui/statistics/DhtWindow.h | 8 +- .../gui/statistics/GlobalRouterStatistics.cpp | 2 +- .../gui/statistics/GlobalRouterStatistics.h | 12 +- .../src/gui/statistics/GxsIdStatistics.cpp | 2 +- .../src/gui/statistics/GxsIdStatistics.h | 2 +- .../gui/statistics/GxsTransportStatistics.cpp | 26 ++-- .../gui/statistics/GxsTransportStatistics.h | 2 +- .../src/gui/statistics/Histogram.cpp | 2 +- retroshare-gui/src/gui/statistics/Histogram.h | 2 +- .../src/gui/statistics/RttStatistics.h | 2 +- .../src/gui/statistics/StatisticsWindow.cpp | 20 +-- .../src/gui/statistics/StatisticsWindow.h | 12 +- .../src/gui/statistics/TurtleRouterDialog.cpp | 48 +++---- .../src/gui/statistics/TurtleRouterDialog.h | 10 +- .../gui/statistics/TurtleRouterStatistics.cpp | 14 +-- .../gui/statistics/TurtleRouterStatistics.h | 6 +- retroshare-gui/src/gui/statistics/dhtgraph.h | 4 +- .../src/gui/statistics/turtlegraph.h | 2 +- .../src/gui/statusbar/OpModeStatus.cpp | 2 +- .../src/gui/statusbar/OpModeStatus.h | 2 +- .../src/gui/statusbar/SoundStatus.cpp | 2 +- .../src/gui/statusbar/SoundStatus.h | 2 +- .../src/gui/statusbar/SysTrayStatus.cpp | 2 +- .../src/gui/statusbar/SysTrayStatus.h | 2 +- .../src/gui/statusbar/ToasterDisable.cpp | 2 +- .../src/gui/statusbar/ToasterDisable.h | 2 +- .../src/gui/statusbar/dhtstatus.cpp | 12 +- retroshare-gui/src/gui/statusbar/dhtstatus.h | 2 +- .../src/gui/statusbar/discstatus.cpp | 2 +- retroshare-gui/src/gui/statusbar/discstatus.h | 2 +- .../src/gui/statusbar/hashingstatus.cpp | 4 +- .../src/gui/statusbar/hashingstatus.h | 2 +- .../src/gui/statusbar/natstatus.cpp | 6 +- retroshare-gui/src/gui/statusbar/natstatus.h | 2 +- .../src/gui/statusbar/peerstatus.cpp | 6 +- retroshare-gui/src/gui/statusbar/peerstatus.h | 2 +- .../src/gui/statusbar/ratesstatus.cpp | 6 +- .../src/gui/statusbar/ratesstatus.h | 2 +- .../src/gui/statusbar/torstatus.cpp | 8 +- retroshare-gui/src/gui/statusbar/torstatus.h | 2 +- retroshare-gui/src/gui/style/RSStyle.cpp | 2 +- retroshare-gui/src/gui/style/RSStyle.h | 2 +- retroshare-gui/src/gui/style/StyleDialog.cpp | 2 +- retroshare-gui/src/gui/style/StyleDialog.h | 2 +- .../src/gui/toaster/ChatLobbyToaster.cpp | 2 +- .../src/gui/toaster/ChatLobbyToaster.h | 4 +- .../src/gui/toaster/ChatToaster.cpp | 2 +- retroshare-gui/src/gui/toaster/ChatToaster.h | 4 +- .../src/gui/toaster/DownloadToaster.cpp | 2 +- .../src/gui/toaster/DownloadToaster.h | 2 +- .../src/gui/toaster/FriendRequestToaster.cpp | 4 +- .../src/gui/toaster/FriendRequestToaster.h | 2 +- .../src/gui/toaster/GroupChatToaster.cpp | 2 +- .../src/gui/toaster/GroupChatToaster.h | 2 +- .../src/gui/toaster/MessageToaster.cpp | 2 +- .../src/gui/toaster/MessageToaster.h | 2 +- .../src/gui/toaster/OnlineToaster.cpp | 2 +- .../src/gui/toaster/OnlineToaster.h | 2 +- .../src/gui/toaster/ToasterItem.cpp | 2 +- retroshare-gui/src/gui/toaster/ToasterItem.h | 2 +- .../src/gui/unfinished/ApplicationWindow.cpp | 2 +- .../src/gui/unfinished/ApplicationWindow.h | 8 +- .../src/gui/unfinished/CalDialog.cpp | 2 +- retroshare-gui/src/gui/unfinished/CalDialog.h | 4 +- .../src/gui/unfinished/ExampleDialog.cpp | 22 ++-- .../src/gui/unfinished/ExampleDialog.h | 6 +- .../src/gui/unfinished/GamesDialog.cpp | 20 +-- .../src/gui/unfinished/GamesDialog.h | 6 +- .../src/gui/unfinished/LibraryDialog.cpp | 16 +-- .../src/gui/unfinished/LibraryDialog.h | 12 +- .../src/gui/unfinished/PhotoDialog.cpp | 84 ++++++------- .../src/gui/unfinished/PhotoDialog.h | 8 +- .../src/gui/unfinished/PhotoShow.cpp | 6 +- retroshare-gui/src/gui/unfinished/PhotoShow.h | 4 +- .../src/gui/unfinished/StatisticDialog.cpp | 26 ++-- .../src/gui/unfinished/StatisticDialog.h | 8 +- .../src/gui/unfinished/profile/ProfileEdit.h | 4 +- .../src/gui/unfinished/profile/ProfileView.h | 6 +- retroshare-gui/src/idle/idle.cpp | 4 +- retroshare-gui/src/idle/idle.h | 2 +- retroshare-gui/src/idle/idle_platform.cpp | 2 +- retroshare-gui/src/main.cpp | 8 +- retroshare-gui/src/retroshare-gui.pro | 118 +++++++++--------- .../src/retroshare-gui/RsAutoUpdatePage.h | 4 +- .../src/retroshare-gui/configpage.h | 2 +- retroshare-gui/src/retroshare-gui/mainpage.h | 2 +- retroshare-gui/src/util/ClickableLabel.cpp | 2 +- retroshare-gui/src/util/ClickableLabel.h | 4 +- retroshare-gui/src/util/DateTime.cpp | 2 +- retroshare-gui/src/util/EventFilter.cpp | 2 +- retroshare-gui/src/util/EventFilter.h | 4 +- retroshare-gui/src/util/FontSizeHandler.cpp | 2 +- retroshare-gui/src/util/FontSizeHandler.h | 2 +- retroshare-gui/src/util/HandleRichText.cpp | 12 +- retroshare-gui/src/util/HandleRichText.h | 4 +- retroshare-gui/src/util/MouseEventFilter.cpp | 2 +- retroshare-gui/src/util/MouseEventFilter.h | 12 +- retroshare-gui/src/util/NonCopyable.h | 6 +- retroshare-gui/src/util/ObjectPainter.cpp | 2 +- retroshare-gui/src/util/ObjectPainter.h | 2 +- retroshare-gui/src/util/PixmapMerging.cpp | 6 +- retroshare-gui/src/util/PixmapMerging.h | 8 +- retroshare-gui/src/util/RetroStyleLabel.cpp | 4 +- retroshare-gui/src/util/RetroStyleLabel.h | 4 +- retroshare-gui/src/util/RichTextEdit.cpp | 2 +- retroshare-gui/src/util/RichTextEdit.h | 2 +- retroshare-gui/src/util/RsAction.cpp | 8 +- retroshare-gui/src/util/RsAction.h | 2 +- retroshare-gui/src/util/RsFile.cpp | 2 +- retroshare-gui/src/util/RsFile.h | 2 +- .../src/util/RsGxsUpdateBroadcast.cpp | 2 +- .../src/util/RsGxsUpdateBroadcast.h | 2 +- retroshare-gui/src/util/RsNetUtil.cpp | 2 +- retroshare-gui/src/util/RsNetUtil.h | 2 +- retroshare-gui/src/util/RsProtectedTimer.cpp | 4 +- retroshare-gui/src/util/RsProtectedTimer.h | 2 +- retroshare-gui/src/util/RsQtVersion.cpp | 2 +- retroshare-gui/src/util/RsQtVersion.h | 2 +- .../src/util/RsSyntaxHighlighter.cpp | 2 +- retroshare-gui/src/util/RsSyntaxHighlighter.h | 2 +- retroshare-gui/src/util/RsUserdata.h | 2 +- retroshare-gui/src/util/TokenQueue.cpp | 2 +- retroshare-gui/src/util/TokenQueue.h | 4 +- retroshare-gui/src/util/Widget.cpp | 2 +- retroshare-gui/src/util/Widget.h | 4 +- .../src/util/WidgetBackgroundImage.cpp | 2 +- .../src/util/WidgetBackgroundImage.h | 4 +- retroshare-gui/src/util/dllexport.h | 8 +- retroshare-gui/src/util/framecatcher.cpp | 4 +- retroshare-gui/src/util/framecatcher.h | 2 +- retroshare-gui/src/util/global.h | 4 +- retroshare-gui/src/util/imageutil.cpp | 2 +- retroshare-gui/src/util/imageutil.h | 2 +- retroshare-gui/src/util/log.cpp | 4 +- retroshare-gui/src/util/log.h | 28 ++--- retroshare-gui/src/util/misc.cpp | 2 +- retroshare-gui/src/util/misc.h | 4 +- retroshare-gui/src/util/printpreview.cpp | 2 +- retroshare-gui/src/util/printpreview.h | 2 +- retroshare-gui/src/util/qtthreadsutils.h | 2 +- retroshare-gui/src/util/retroshareWin32.cpp | 26 ++-- retroshare-gui/src/util/retroshareWin32.h | 2 +- retroshare-gui/src/util/rsqtutildll.h | 4 +- retroshare-gui/src/util/rsutildll.h | 6 +- retroshare-gui/src/util/stringutil.cpp | 22 ++-- retroshare-gui/src/util/stringutil.h | 4 +- 390 files changed, 1208 insertions(+), 1204 deletions(-) diff --git a/retroshare-gui/src/TorControl/TorControlWindow.h b/retroshare-gui/src/TorControl/TorControlWindow.h index 412c08ed5..422d483fd 100644 --- a/retroshare-gui/src/TorControl/TorControlWindow.h +++ b/retroshare-gui/src/TorControl/TorControlWindow.h @@ -1,3 +1,5 @@ +#pragma once + #include "retroshare/rsevents.h" #include "retroshare/rstor.h" #include "ui_TorControlWindow.h" diff --git a/retroshare-gui/src/gui/AboutDialog.cpp b/retroshare-gui/src/gui/AboutDialog.cpp index eb0f6a1e9..c6e6355e5 100644 --- a/retroshare-gui/src/gui/AboutDialog.cpp +++ b/retroshare-gui/src/gui/AboutDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/AboutDialog.cpp * + * retroshare-gui/src/gui/AboutDialog.cpp * * * * Copyright (C) 2012 Retroshare Team * * Copyright (C) 2008 Unipro, Russia (http://ugene.unipro.ru) * diff --git a/retroshare-gui/src/gui/AboutDialog.h b/retroshare-gui/src/gui/AboutDialog.h index 9afd498aa..817ae1dfc 100644 --- a/retroshare-gui/src/gui/AboutDialog.h +++ b/retroshare-gui/src/gui/AboutDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/AboutDialog.h * + * retroshare-gui/src/gui/AboutDialog.h * * * * Copyright (C) 2012 Retroshare Team * * Copyright (C) 2008 Unipro, Russia (http://ugene.unipro.ru) * diff --git a/retroshare-gui/src/gui/AboutWidget.cpp b/retroshare-gui/src/gui/AboutWidget.cpp index 5ed017d24..b17ee7c13 100644 --- a/retroshare-gui/src/gui/AboutWidget.cpp +++ b/retroshare-gui/src/gui/AboutWidget.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/AboutWidget.cpp * + * retroshare-gui/src/gui/AboutWidget.cpp * * * * Copyright (C) 2012 Retroshare Team * * Copyright (C) 2008 Unipro, Russia (http://ugene.unipro.ru) * @@ -417,7 +417,7 @@ void AWidget::mouseMoveEvent(QMouseEvent* e) { } -void AWidget::calcWater(int npage, int density) { +void AWidget::calcWater(int npage, int density) { int w = image1.width(); int h = image1.height(); int count = w + 1; @@ -529,7 +529,7 @@ void AWidget::drawWater(QRgb* srcImage,QRgb* dstImage) { // T TBoard::TBoard(QWidget *parent) { Q_UNUSED(parent); - + setFocusPolicy(Qt::StrongFocus); isStarted = false; isWaitingAfterLine = false; @@ -598,12 +598,12 @@ void TBoard::paintEvent(QPaintEvent *event) { QWidget::paintEvent(event); QPainter painter(this); - + painter.setPen(Qt::black); - painter.drawRect(frameRect()); + painter.drawRect(frameRect()); QRect rect = boardRect(); painter.fillRect(rect, Qt::white); - + if (isPaused) { painter.drawText(rect, Qt::AlignCenter, tr("Pause")); return; diff --git a/retroshare-gui/src/gui/AboutWidget.h b/retroshare-gui/src/gui/AboutWidget.h index a40ca4596..9617b8699 100644 --- a/retroshare-gui/src/gui/AboutWidget.h +++ b/retroshare-gui/src/gui/AboutWidget.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/AboutWidget.h * + * retroshare-gui/src/gui/AboutWidget.h * * * * Copyright (C) 2012 Retroshare Team * * Copyright (C) 2008 Unipro, Russia (http://ugene.unipro.ru) * @@ -164,7 +164,7 @@ public: public slots: void start(); void pause(); - + signals: void scoreChanged(int score); void levelChanged(int level); diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp index 062ee6a7c..57a1ed1a1 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp +++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/ChatLobbyWidget.cpp * + * retroshare-gui/src/gui/ChatLobbyWidget.cpp * * * * Copyright (C) 2012 Retroshare Team * * * @@ -78,12 +78,12 @@ #define IMAGE_PUBLIC ":/icons/png/chats.png" #define IMAGE_PRIVATE ":/icons/png/chats-private.png" #define IMAGE_SIGNED ":/icons/png/chats-signed.png" -#define IMAGE_SUBSCRIBE ":/icons/png/enter.png" +#define IMAGE_SUBSCRIBE ":/icons/png/enter.png" #define IMAGE_UNSUBSCRIBE ":/icons/png/leave2.png" #define IMAGE_PEER_ENTERING ":images/user/add_user24.png" #define IMAGE_PEER_LEAVING ":images/user/remove_user24.png" -#define IMAGE_TYPING ":icons/png/typing.png" -#define IMAGE_MESSAGE ":images/chat.png" +#define IMAGE_TYPING ":icons/png/typing.png" +#define IMAGE_MESSAGE ":images/chat.png" #define IMAGE_AUTOSUBSCRIBE ":images/accepted16.png" #define IMAGE_COPYRSLINK ":/icons/png/copy.png" @@ -263,7 +263,7 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags) ).arg(QString::number(2*hbH), QString::number(hbH)) ; registerHelpButton(ui.helpButton,help_str,"ChatLobbyDialog") ; - + int ltwH = misc::getFontSizeFactor("LobbyTreeWidget", 1.5).height(); ui.lobbyTreeWidget->setIconSize(QSize(ltwH,ltwH)); @@ -441,7 +441,7 @@ static void updateItem(QTreeWidget *treeWidget, QTreeWidgetItem *item, ChatLobby //TODO (Phenom): Add qproperty for these text colors in stylesheets // As palette is not updated by stylesheet QColor color = treeWidget->palette().color(QPalette::Active, QPalette::Text); - + if (!subscribed) { // Average between Base and Text colors QColor color2 = treeWidget->palette().color(QPalette::Active, QPalette::Base); @@ -455,7 +455,7 @@ static void updateItem(QTreeWidget *treeWidget, QTreeWidgetItem *item, ChatLobby +QObject::tr("Participants:")+" "+QString::number(count)+"\n" +QObject::tr("Auto Subscribe:")+" "+(autoSubscribe? QObject::tr("enabled"): QObject::tr("disabled"))+"\n" +QObject::tr("Id:")+" "+QString::number(id,16) ; - + if(lobby_flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED) { tooltipstr += QObject::tr("\nSecurity: no anonymous IDs") ; @@ -468,7 +468,7 @@ static void updateItem(QTreeWidget *treeWidget, QTreeWidgetItem *item, ChatLobby void ChatLobbyWidget::addChatPage(ChatLobbyDialog *d) { - // check that the page does not already exist. + // check that the page does not already exist. if(_lobby_infos.find(d->id()) == _lobby_infos.end()) { @@ -538,7 +538,7 @@ void ChatLobbyWidget::updateDisplay() #endif // now, do a nice display of lobbies - + RsPeerId vpid; std::list::const_iterator lobbyIt; @@ -547,7 +547,7 @@ void ChatLobbyWidget::updateDisplay() for(int p=0;p<4;++p) { QTreeWidgetItem *lobby_item =NULL; - switch (p) + switch (p) { case 0: lobby_item = privateSubLobbyItem; break; case 1: lobby_item = publicSubLobbyItem; break; @@ -562,25 +562,25 @@ void ChatLobbyWidget::updateDisplay() while (childIndex < childCnt) { QTreeWidgetItem *itemLoop = lobby_item->child(childIndex); - if (itemLoop->type() == TYPE_LOBBY) + if (itemLoop->type() == TYPE_LOBBY) { // check for visible lobby // uint32_t i; - - for (i = 0; i < visibleLobbies.size(); ++i) - if (itemLoop->data(COLUMN_DATA, ROLE_ID).toULongLong() == visibleLobbies[i].lobby_id) + + for (i = 0; i < visibleLobbies.size(); ++i) + if (itemLoop->data(COLUMN_DATA, ROLE_ID).toULongLong() == visibleLobbies[i].lobby_id) break; - if (i >= visibleLobbies.size()) + if (i >= visibleLobbies.size()) { // Check for participating lobby with public level // - for (lobbyIt = lobbies.begin(); lobbyIt != lobbies.end(); ++lobbyIt) + for (lobbyIt = lobbies.begin(); lobbyIt != lobbies.end(); ++lobbyIt) if(itemLoop->data(COLUMN_DATA, ROLE_ID).toULongLong() == *lobbyIt) break; - if (lobbyIt == lobbies.end()) + if (lobbyIt == lobbies.end()) { delete(lobby_item->takeChild(lobby_item->indexOfChild(itemLoop))); childCnt = lobby_item->childCount(); @@ -594,7 +594,7 @@ void ChatLobbyWidget::updateDisplay() // Now add visible lobbies // - for (uint32_t i = 0; i < visibleLobbies.size(); ++i) + for (uint32_t i = 0; i < visibleLobbies.size(); ++i) { const VisibleChatLobbyRecord &lobby = visibleLobbies[i]; @@ -660,15 +660,15 @@ void ChatLobbyWidget::updateDisplay() } ChatLobbyFlags lobby_flags = lobby.lobby_flags ; - + QIcon icon; - if (item == NULL) + if (item == NULL) { item = new RSTreeWidgetItem(compareRole, TYPE_LOBBY); icon = (lobby.lobby_flags & RS_CHAT_LOBBY_FLAGS_PUBLIC) ? FilesDefs::getIconFromQtResourcePath(IMAGE_PUBLIC) : FilesDefs::getIconFromQtResourcePath(IMAGE_PRIVATE); lobby_item->addChild(item); - - } + + } else { if (item->data(COLUMN_DATA, ROLE_SUBSCRIBED).toBool() != subscribed) { @@ -699,7 +699,7 @@ void ChatLobbyWidget::updateDisplay() // Now add participating lobbies. // - for (lobbyIt = lobbies.begin(); lobbyIt != lobbies.end(); ++lobbyIt) + for (lobbyIt = lobbies.begin(); lobbyIt != lobbies.end(); ++lobbyIt) { ChatLobbyInfo lobby ; rsMsgs->getChatLobbyInfo(*lobbyIt,lobby) ; @@ -727,10 +727,10 @@ void ChatLobbyWidget::updateDisplay() } QIcon icon; - + ChatLobbyFlags lobby_flags = lobby.lobby_flags ; - - if (item == NULL) + + if (item == NULL) { item = new RSTreeWidgetItem(compareRole, TYPE_LOBBY); icon = (lobby.lobby_flags & RS_CHAT_LOBBY_FLAGS_PUBLIC) ? FilesDefs::getIconFromQtResourcePath(IMAGE_PUBLIC) : FilesDefs::getIconFromQtResourcePath(IMAGE_PRIVATE); @@ -809,10 +809,10 @@ void ChatLobbyWidget::createIdentityAndSubscribe() IdEditDialog dlg(this); dlg.setupNewId(false); - + if(flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED) // dlg.enforceNoAnonIds() ; - + dlg.exec(); // fetch new id std::list own_ids; @@ -891,7 +891,7 @@ void ChatLobbyWidget::subscribeChatLobbyAtItem(QTreeWidgetItem *item) { IdEditDialog dlg(this); dlg.setupNewId(false); - + if(flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED) // dlg.enforceNoAnonIds() ; dlg.exec(); @@ -903,11 +903,11 @@ void ChatLobbyWidget::subscribeChatLobbyAtItem(QTreeWidgetItem *item) else { rsMsgs->getDefaultIdentityForChatLobby(gxs_id); - + RsIdentityDetails idd ; if(!rsIdentity->getIdDetails(gxs_id,idd)) return ; - + if( (flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED) && !(idd.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED)) { QMessageBox::warning(NULL,tr("Default identity is anonymous"),tr("You cannot join this chat room with your default identity, since it is anonymous and the chat room forbids it.")) ; @@ -1032,7 +1032,7 @@ QTreeWidgetItem *ChatLobbyWidget::getTreeWidgetItem(ChatLobbyId id) while (childIndex < childCnt) { QTreeWidgetItem *itemLoop = lobby_item->child(childIndex); - if (itemLoop->type() == TYPE_LOBBY && itemLoop->data(COLUMN_DATA, ROLE_ID).toULongLong() == id) + if (itemLoop->type() == TYPE_LOBBY && itemLoop->data(COLUMN_DATA, ROLE_ID).toULongLong() == id) return itemLoop ; ++childIndex ; @@ -1043,7 +1043,7 @@ QTreeWidgetItem *ChatLobbyWidget::getTreeWidgetItem(ChatLobbyId id) void ChatLobbyWidget::updateTypingStatus(ChatLobbyId id) { QTreeWidgetItem *item = getTreeWidgetItem(id) ; - + if(item != NULL) { item->setIcon(COLUMN_NAME,FilesDefs::getIconFromQtResourcePath(IMAGE_TYPING)) ; @@ -1055,7 +1055,7 @@ void ChatLobbyWidget::updateTypingStatus(ChatLobbyId id) void ChatLobbyWidget::updatePeerLeaving(ChatLobbyId id) { QTreeWidgetItem *item = getTreeWidgetItem(id) ; - + if(item != NULL) { item->setIcon(COLUMN_NAME,FilesDefs::getIconFromQtResourcePath(IMAGE_PEER_LEAVING)) ; @@ -1067,7 +1067,7 @@ void ChatLobbyWidget::updatePeerLeaving(ChatLobbyId id) void ChatLobbyWidget::updatePeerEntering(ChatLobbyId id) { QTreeWidgetItem *item = getTreeWidgetItem(id) ; - + if(item != NULL) { item->setIcon(COLUMN_NAME,FilesDefs::getIconFromQtResourcePath(IMAGE_PEER_ENTERING)) ; diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.h b/retroshare-gui/src/gui/ChatLobbyWidget.h index 8b355515a..278174841 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.h +++ b/retroshare-gui/src/gui/ChatLobbyWidget.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/ChatLobbyWidget.h * + * retroshare-gui/src/gui/ChatLobbyWidget.h * * * * Copyright (C) 2012 Retroshare Team * * * @@ -107,7 +107,7 @@ protected slots: private slots: void filterColumnChanged(int); void filterItems(const QString &text); - + void setShowUserCountColumn(bool show); void setShowTopicColumn(bool show); diff --git a/retroshare-gui/src/gui/FriendServerControl.cpp b/retroshare-gui/src/gui/FriendServerControl.cpp index eb5988589..97b847c24 100644 --- a/retroshare-gui/src/gui/FriendServerControl.cpp +++ b/retroshare-gui/src/gui/FriendServerControl.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/FriendServer.cpp * + * retroshare-gui/src/gui/FriendServer.cpp * * * * Copyright (c) 2021 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/FriendServerControl.h b/retroshare-gui/src/gui/FriendServerControl.h index ddc66ee8a..178e72b5b 100644 --- a/retroshare-gui/src/gui/FriendServerControl.h +++ b/retroshare-gui/src/gui/FriendServerControl.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/NetworkView.h * + * retroshare-gui/src/gui/NetworkView.h * * * * Copyright (c) 2008 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index 34a19d609..709cb940c 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/FriendsDialog.cpp * + * retroshare-gui/src/gui/FriendsDialog.cpp * * * * Copyright (C) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/FriendsDialog.h b/retroshare-gui/src/gui/FriendsDialog.h index f6ec0e0a8..065c4c5d5 100644 --- a/retroshare-gui/src/gui/FriendsDialog.h +++ b/retroshare-gui/src/gui/FriendsDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/FriendsDialog.h * + * retroshare-gui/src/gui/FriendsDialog.h * * * * Copyright (C) 2012 Retroshare Team * * * @@ -44,7 +44,7 @@ public: NetworkTab = 2, /** Network page. */ NetworkViewTab = 3, /** Network new graph. */ BroadcastTab = 4 /** Old group chat page. */ - + }; /** Default Constructor */ @@ -68,7 +68,7 @@ public: FriendServerControl *friendServerControl ; IdDialog *idDialog; - + private slots: void addFriend(); diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index f829602b3..17a50deea 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/GenCertDialog.cpp * + * retroshare-gui/src/gui/GenCertDialog.cpp * * * * Copyright (C) 2006 Crypton * * * @@ -53,7 +53,7 @@ class EntropyCollectorWidget: public QTextBrowser { public: explicit EntropyCollectorWidget(QProgressBar *pr,QWidget *p = NULL) - : QTextBrowser(p) + : QTextBrowser(p) { progress = pr ; setMouseTracking(true) ; @@ -131,7 +131,7 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent) { /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); - + //ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/svg/profile.svg")); //ui.headerFrame->setHeaderText(tr("Create a new profile")); @@ -180,7 +180,7 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent) /* get all available pgp private certificates.... * mark last one as default. */ - + //QMenu *menu = new QMenu(tr("Advanced options")); //menu->addAction(ui.adv_checkbox); //menu->addAction(ui.reuse_existing_node_CB); diff --git a/retroshare-gui/src/gui/GenCertDialog.h b/retroshare-gui/src/gui/GenCertDialog.h index 6d9d3610a..7c67e083f 100644 --- a/retroshare-gui/src/gui/GenCertDialog.h +++ b/retroshare-gui/src/gui/GenCertDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/GenCertDialog.h * + * retroshare-gui/src/gui/GenCertDialog.h * * * * Copyright (C) 2006 Crypton * * * diff --git a/retroshare-gui/src/gui/GetStartedDialog.cpp b/retroshare-gui/src/gui/GetStartedDialog.cpp index 954189997..eb55abc8e 100644 --- a/retroshare-gui/src/gui/GetStartedDialog.cpp +++ b/retroshare-gui/src/gui/GetStartedDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/GetStartedDialog.cpp * + * retroshare-gui/src/gui/GetStartedDialog.cpp * * * * Copyright (C) 2011 Robert Fernie * * * @@ -209,7 +209,7 @@ void GetStartedDialog::addFriends() void GetStartedDialog::inviteFriends() { if (RsAutoUpdatePage::eventsLocked() == true) - { + { std::cerr << "GetStartedDialog::inviteFriends() EventsLocked... waiting"; std::cerr << std::endl; @@ -303,7 +303,7 @@ void GetStartedDialog::emailFeedback() void GetStartedDialog::emailSupport() { if (RsAutoUpdatePage::eventsLocked() == true) - { + { std::cerr << "GetStartedDialog::emailSupport() EventsLocked... waiting"; std::cerr << std::endl; diff --git a/retroshare-gui/src/gui/GetStartedDialog.h b/retroshare-gui/src/gui/GetStartedDialog.h index 6d943958a..131ceb659 100644 --- a/retroshare-gui/src/gui/GetStartedDialog.h +++ b/retroshare-gui/src/gui/GetStartedDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/GetStartedDialog.h * + * retroshare-gui/src/gui/GetStartedDialog.h * * * * Copyright (C) 2011 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/HelpDialog.cpp b/retroshare-gui/src/gui/HelpDialog.cpp index ddaf925d4..a13479946 100644 --- a/retroshare-gui/src/gui/HelpDialog.cpp +++ b/retroshare-gui/src/gui/HelpDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/HelpDialog.cpp * + * retroshare-gui/src/gui/HelpDialog.cpp * * * * Copyright (C) 2006 Crypton * * * diff --git a/retroshare-gui/src/gui/HelpDialog.h b/retroshare-gui/src/gui/HelpDialog.h index aedf087f4..228aa5990 100644 --- a/retroshare-gui/src/gui/HelpDialog.h +++ b/retroshare-gui/src/gui/HelpDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/HelpDialog.h * + * retroshare-gui/src/gui/HelpDialog.h * * * * Copyright (C) 2006 Crypton * * * @@ -29,7 +29,7 @@ namespace Ui { class HelpDialog; } -class HelpDialog : public QDialog +class HelpDialog : public QDialog { Q_OBJECT diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp index 115281538..0dc36da53 100644 --- a/retroshare-gui/src/gui/HomePage.cpp +++ b/retroshare-gui/src/gui/HomePage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/HomePage.cpp * + * retroshare-gui/src/gui/HomePage.cpp * * * * Copyright (C) 2016 Defnax * * * diff --git a/retroshare-gui/src/gui/HomePage.h b/retroshare-gui/src/gui/HomePage.h index 2dfc62f82..b98191415 100644 --- a/retroshare-gui/src/gui/HomePage.h +++ b/retroshare-gui/src/gui/HomePage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/HomePage.h * + * retroshare-gui/src/gui/HomePage.h * * * * Copyright (C) 2016 Defnax * * * diff --git a/retroshare-gui/src/gui/Identity/IdDetailsDialog.h b/retroshare-gui/src/gui/Identity/IdDetailsDialog.h index abefaf872..77e5f7851 100644 --- a/retroshare-gui/src/gui/Identity/IdDetailsDialog.h +++ b/retroshare-gui/src/gui/Identity/IdDetailsDialog.h @@ -44,7 +44,7 @@ public: private slots: void modifyReputation(); void toggleAutoBanIdentities(bool b); - + static QString inviteMessage(); void sendInvite(); private : diff --git a/retroshare-gui/src/gui/LogoBar.cpp b/retroshare-gui/src/gui/LogoBar.cpp index a5759ed16..aca60af4b 100644 --- a/retroshare-gui/src/gui/LogoBar.cpp +++ b/retroshare-gui/src/gui/LogoBar.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/LogoBar.cpp * + * retroshare-gui/src/gui/LogoBar.cpp * * * * Copyright (c) 2006 Crypton * * * @@ -39,7 +39,7 @@ void LogoBar::init() { setFrameShape(QFrame::NoFrame); - + //LogoButton _logoButton = new RetroStyleLabel(this); _logoButton->setPixmaps( diff --git a/retroshare-gui/src/gui/LogoBar.h b/retroshare-gui/src/gui/LogoBar.h index 497753799..f051c8cde 100644 --- a/retroshare-gui/src/gui/LogoBar.h +++ b/retroshare-gui/src/gui/LogoBar.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/LogoBar.h * + * retroshare-gui/src/gui/LogoBar.h * * * * Copyright (c) 2006 Crypton * * * @@ -33,12 +33,12 @@ class QIcon; /** * logo bar inside the login window. * - * - * - * - * * - * + * + * + * + * + * */ class LogoBar : public QFrame { Q_OBJECT @@ -69,7 +69,7 @@ private: void init(); - + RetroStyleLabel * _logoButton; diff --git a/retroshare-gui/src/gui/MainPage.cpp b/retroshare-gui/src/gui/MainPage.cpp index 6136343d7..6a2c3d265 100644 --- a/retroshare-gui/src/gui/MainPage.cpp +++ b/retroshare-gui/src/gui/MainPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/MainPage.cpp * + * retroshare-gui/src/gui/MainPage.cpp * * * * Copyright (c) 2006 Retroshare Team * * * @@ -50,7 +50,7 @@ void MainPage::registerHelpButton(QToolButton *button, const QString& help_html_ if (mHelpBrowser == nullptr) mHelpBrowser = new FloatingHelpBrowser(this, button) ; - + int H = misc::getFontSizeFactor("HelpButton").height(); button->setIconSize(QSize(H, H)) ;//Square Icon diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index a1688867d..94e47f42d 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/MainWindow.cpp * + * retroshare-gui/src/gui/MainWindow.cpp * * * * Copyright (c) 2006 Crypton * * * @@ -692,7 +692,7 @@ void MainWindow::createMenuBar() actionMinimize->setShortcutContext(Qt::ApplicationShortcut); actionMinimize->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M)); actionMinimize->setShortcutVisibleInContextMenu(true); - connect(actionMinimize,SIGNAL(triggered()),this,SLOT(minimizeWindow())) ; + connect(actionMinimize,SIGNAL(triggered()),this,SLOT(minimizeWindow())) ; actionCloseWindow = new QAction(tr("Close window"),this); actionCloseWindow->setShortcutContext(Qt::ApplicationShortcut); @@ -1229,7 +1229,7 @@ void MainWindow::showWebinterface() WebuiPage::showWebui(); } #endif // ENABLE_WEBUI -#endif +#endif /** Shows Application window */ #ifdef UNFINISHED diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h index 59f927ac6..9b858f378 100644 --- a/retroshare-gui/src/gui/MainWindow.h +++ b/retroshare-gui/src/gui/MainWindow.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/MainWindow.h * + * retroshare-gui/src/gui/MainWindow.h * * * * Copyright (c) 2006 Retroshare Team * * * @@ -253,7 +253,7 @@ protected: MainWindow(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); void closeEvent(QCloseEvent *); - + /** Called when the user changes the UI translation. */ virtual void retranslateUi(); @@ -285,7 +285,7 @@ private slots: #endif //void servicePermission(); -#ifdef UNFINISHED +#ifdef UNFINISHED void showApplWindow(); #endif @@ -307,7 +307,7 @@ private slots: /** Called when user attempts to quit via quit button*/ void doQuit(); - + void updateTrayCombine(); private: diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp index fca08966f..a59d4e679 100644 --- a/retroshare-gui/src/gui/MessengerWindow.cpp +++ b/retroshare-gui/src/gui/MessengerWindow.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/MessengerWindow.cpp * + * retroshare-gui/src/gui/MessengerWindow.cpp * * * * Copyright (c) 2006 Crypton * * * @@ -138,7 +138,7 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WindowFlags flags) button->setIcon(QIcon(":/icons/png/filesharing.png")); button->setToolTip(tr("Share files for your friends")); connect(button, SIGNAL(clicked()), this, SLOT(openShareManager())); - ui.friendList->addToolButton(button); + ui.friendList->addToolButton(button); button->setIconSize(QSize(27, 27)); // load settings @@ -222,7 +222,7 @@ void MessengerWindow::openShareManager() /** Loads own personal status message */ void MessengerWindow::loadmystatusmessage() -{ +{ ui.messagelineEdit->setEditText( QString::fromUtf8(rsMsgs->getCustomStateString().c_str())); } diff --git a/retroshare-gui/src/gui/MessengerWindow.h b/retroshare-gui/src/gui/MessengerWindow.h index e6a0c10db..e051f3068 100644 --- a/retroshare-gui/src/gui/MessengerWindow.h +++ b/retroshare-gui/src/gui/MessengerWindow.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/MessengerWindow.h * + * retroshare-gui/src/gui/MessengerWindow.h * * * * Copyright (c) 2006 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp index e0e7f2494..0f0697a43 100644 --- a/retroshare-gui/src/gui/NetworkDialog.cpp +++ b/retroshare-gui/src/gui/NetworkDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/NetworkDialog.cpp * + * retroshare-gui/src/gui/NetworkDialog.cpp * * * * Copyright (c) 2006 Crypton * * * @@ -61,7 +61,7 @@ NetworkDialog::NetworkDialog(QWidget */*parent*/) { /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); - + connect( ui.filterLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterItems(QString))); connect( ui.filterLineEdit, SIGNAL(filterChanged(int)), this, SLOT(filterColumnChanged(int))); @@ -191,7 +191,7 @@ void NetworkDialog::removeSelectedKeys() } if(!selected.empty()) removeKeys(selected); - + updateDisplay(); } diff --git a/retroshare-gui/src/gui/NetworkDialog.h b/retroshare-gui/src/gui/NetworkDialog.h index 216cd8cc5..9407d4e08 100644 --- a/retroshare-gui/src/gui/NetworkDialog.h +++ b/retroshare-gui/src/gui/NetworkDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/NetworkDialog.h * + * retroshare-gui/src/gui/NetworkDialog.h * * * * Copyright (c) 2006 Crypton * * * @@ -85,7 +85,7 @@ private slots: //void on_actionAddFriend_activated(); //void on_actionExportKey_activated(); //void on_actionCreate_New_Profile_activated(); - + void filterColumnChanged(int); private: diff --git a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.cpp b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.cpp index 9da32fe2a..ade7bc491 100644 --- a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.cpp +++ b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.cpp @@ -26,7 +26,7 @@ #include #include -bool pgpid_item_proxy::lessThan(const QModelIndex &left, const QModelIndex &right) const +bool pgpid_item_proxy::lessThan(const QModelIndex &left, const QModelIndex &right) const { if(left.column() == pgpid_item_model::PGP_ITEM_MODEL_COLUMN_LAST_USED) return left.data(Qt::EditRole).toUInt() < right.data(Qt::EditRole).toUInt(); diff --git a/retroshare-gui/src/gui/NetworkView.cpp b/retroshare-gui/src/gui/NetworkView.cpp index b42d0213e..58c4d267b 100644 --- a/retroshare-gui/src/gui/NetworkView.cpp +++ b/retroshare-gui/src/gui/NetworkView.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/NetworkView.cpp * + * retroshare-gui/src/gui/NetworkView.cpp * * * * Copyright (c) 2008 Robert Fernie * * * @@ -168,7 +168,7 @@ void NetworkView::updateDisplay() // Put own id in queue, and empty the queue, treating all nodes. // while(!nodes_to_treat.empty()) - { + { NodeInfo info(nodes_to_treat.back()) ; nodes_to_treat.pop_back() ; #ifdef DEBUG_NETWORKVIEW @@ -199,7 +199,7 @@ void NetworkView::updateDisplay() case RS_TRUST_LVL_FULL: case RS_TRUST_LVL_ULTIMATE: auth = GraphWidget::ELASTIC_NODE_AUTH_FULL ; break; case RS_TRUST_LVL_UNKNOWN: - case RS_TRUST_LVL_UNDEFINED: + case RS_TRUST_LVL_UNDEFINED: case RS_TRUST_LVL_NEVER: default: auth = GraphWidget::ELASTIC_NODE_AUTH_UNKNOWN ; break ; } @@ -241,7 +241,7 @@ void NetworkView::updateDisplay() { std::list friendList ; - if(rsDisc->getDiscPgpFriends(it->first,friendList)) + if(rsDisc->getDiscPgpFriends(it->first,friendList)) for(std::list::const_iterator sit(friendList.begin()); sit != friendList.end(); ++sit) { #ifdef DEBUG_NETWORKVIEW diff --git a/retroshare-gui/src/gui/NetworkView.h b/retroshare-gui/src/gui/NetworkView.h index c439cb6c4..689dd8b34 100644 --- a/retroshare-gui/src/gui/NetworkView.h +++ b/retroshare-gui/src/gui/NetworkView.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/NetworkView.h * + * retroshare-gui/src/gui/NetworkView.h * * * * Copyright (c) 2008 Robert Fernie * * * @@ -30,7 +30,7 @@ #include "ui_NetworkView.h" -class NetworkView : public RsAutoUpdatePage +class NetworkView : public RsAutoUpdatePage { Q_OBJECT diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index 1b67c92a9..2a413e8d3 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/NewsFeed.cpp * + * retroshare-gui/src/gui/NewsFeed.cpp * * * * Copyright (c) 2008 Robert Fernie * * * @@ -469,7 +469,7 @@ void NewsFeed::handleSecurityEvent(std::shared_ptr event) addFeedItemIfUnique(new PeerItem(this, NEWSFEED_PEERLIST, e.mSslId, PEER_TYPE_HELLO, false), true ); return; } - + RsFeedTypeFlags FeedItemType(RsFeedTypeFlags::RS_FEED_TYPE_NONE); diff --git a/retroshare-gui/src/gui/NewsFeed.h b/retroshare-gui/src/gui/NewsFeed.h index fed1d41b5..6e6666da4 100644 --- a/retroshare-gui/src/gui/NewsFeed.h +++ b/retroshare-gui/src/gui/NewsFeed.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/NewsFeed.h * + * retroshare-gui/src/gui/NewsFeed.h * * * * Copyright (c) 2008 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/People/CircleItem.cpp b/retroshare-gui/src/gui/People/CircleItem.cpp index 10f37d007..07714b99f 100644 --- a/retroshare-gui/src/gui/People/CircleItem.cpp +++ b/retroshare-gui/src/gui/People/CircleItem.cpp @@ -81,7 +81,7 @@ void CircleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option gradient.setColorAt(0.0f,Qt::lightGray) ; gradient.setColorAt(1.0f,Qt::darkGray) ; painter->setBrush(gradient); - + painter->setPen(Qt::NoPen); painter->setBrush(Qt::lightGray); painter->drawEllipse(-7, -7, 20, 20); @@ -142,7 +142,7 @@ void CircleItem::mousePressEvent(QGraphicsSceneMouseEvent *event) update(); QGraphicsItem::mousePressEvent(event); } -void CircleItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +void CircleItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { QMenu contextMnu ; diff --git a/retroshare-gui/src/gui/People/CircleItem.h b/retroshare-gui/src/gui/People/CircleItem.h index c61343ab7..7cd85b3c3 100644 --- a/retroshare-gui/src/gui/People/CircleItem.h +++ b/retroshare-gui/src/gui/People/CircleItem.h @@ -23,7 +23,7 @@ class CircleItem: public QObject, public QGraphicsItem static CircleItem *_selected_node ; - const RsGroupMetaData& groupInfo() const { return _group_info ; } + const RsGroupMetaData& groupInfo() const { return _group_info ; } signals: void itemChanged() ; diff --git a/retroshare-gui/src/gui/People/CircleWidget.cpp b/retroshare-gui/src/gui/People/CircleWidget.cpp index 03979aee0..81b62a0c4 100644 --- a/retroshare-gui/src/gui/People/CircleWidget.cpp +++ b/retroshare-gui/src/gui/People/CircleWidget.cpp @@ -44,7 +44,7 @@ CircleWidget::CircleWidget(QString name/*=QString()*/ ui->graphicsView->setEnabled(false); ui->graphicsView->setAlignment(Qt::AlignLeft | Qt::AlignTop); - + ui->graphicsView->setRenderHints( QPainter::Antialiasing | QPainter::SmoothPixmapTransform ); setIsCurrent(false); @@ -82,7 +82,7 @@ void CircleWidget::updateData(const RsGroupMetaData& gxs_group_info update(); //} - if(!same_RsGxsCircleDetails(_circle_details , details)) + if(!same_RsGxsCircleDetails(_circle_details , details)) { _circle_details=details; typedef std::set::iterator itUnknownPeers; @@ -96,17 +96,17 @@ void CircleWidget::updateData(const RsGroupMetaData& gxs_group_info } typedef std::set::const_iterator itAllowedPeers; - for (itAllowedPeers it = _circle_details.mAllowedNodes.begin() ; it != _circle_details.mAllowedNodes.end() ; ++it ) + for (itAllowedPeers it = _circle_details.mAllowedNodes.begin() ; it != _circle_details.mAllowedNodes.end() ; ++it ) { RsPgpId pgp_id = *it; emit askForPGPIdentityWidget(pgp_id); // std::set gxs_id_list = it->second; // typedef std::set::const_iterator itGxsId; -// for (itGxsId curs=gxs_id_list.begin(); curs != gxs_id_list.end(); ++curs) +// for (itGxsId curs=gxs_id_list.begin(); curs != gxs_id_list.end(); ++curs) // { // RsGxsId gxs_id = *curs; -// if(!gxs_id.isNull()) +// if(!gxs_id.isNull()) // emit askForGXSIdentityWidget(gxs_id); // } // } diff --git a/retroshare-gui/src/gui/People/IdentityItem.h b/retroshare-gui/src/gui/People/IdentityItem.h index af9da6662..f31be8287 100644 --- a/retroshare-gui/src/gui/People/IdentityItem.h +++ b/retroshare-gui/src/gui/People/IdentityItem.h @@ -19,7 +19,7 @@ class IdentityItem: public QObject, public QGraphicsItem static const int IMG_SIZE = 64; static IdentityItem *_selected_node ; - const RsGxsIdGroup& groupInfo() const { return _group_info ; } + const RsGxsIdGroup& groupInfo() const { return _group_info ; } public slots: void distantChat() ; diff --git a/retroshare-gui/src/gui/People/PeopleDialog.cpp b/retroshare-gui/src/gui/People/PeopleDialog.cpp index 42bf448a4..d5ba983b3 100644 --- a/retroshare-gui/src/gui/People/PeopleDialog.cpp +++ b/retroshare-gui/src/gui/People/PeopleDialog.cpp @@ -35,8 +35,8 @@ #include "retroshare/rsidentity.h" #include "retroshare/rsgxscircles.h" #include "retroshare/rsgxsflags.h" -#include "retroshare/rsmsgs.h" -#include "retroshare/rsids.h" +#include "retroshare/rsmsgs.h" +#include "retroshare/rsids.h" #include #include @@ -65,7 +65,7 @@ PeopleDialog::PeopleDialog(QWidget *parent) //mCirclesBroadcastBase = new RsGxsUpdateBroadcastBase(rsGxsCircles, this); //connect(mCirclesBroadcastBase, SIGNAL(fillDisplay(bool)), this, SLOT(updateCirclesDisplay(bool))); - + tabWidget->removeTab(1); //hide circle flow widget not functional yet pictureFlowWidgetExternal->hide(); @@ -441,7 +441,7 @@ void PeopleDialog::iw_AddButtonClickedExt() if (dest) { QMenu contextMnu( this ); - + QMenu *mnu = contextMnu.addMenu(FilesDefs::getIconFromQtResourcePath(":/icons/png/circles.png"),tr("Invite to Circle")) ; std::map::iterator itCurs; @@ -455,10 +455,10 @@ void PeopleDialog::iw_AddButtonClickedExt() action->setData(QString::fromStdString(curs->groupInfo().mGroupId.toStdString()) + ";" + QString::fromStdString(dest->groupInfo().mMeta.mGroupId.toStdString())); } - + std::list own_identities ; rsIdentity->getOwnIds(own_identities) ; - + if(own_identities.size() <= 1) { QAction *action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/chats.png"), tr("Chat with this person"), this, SLOT(chatIdentity())); @@ -486,20 +486,20 @@ void PeopleDialog::iw_AddButtonClickedExt() action->setData(QString::fromStdString((*it).toStdString()) + ";" + QString::fromStdString(dest->groupInfo().mMeta.mGroupId.toStdString())) ; } } - + QAction *actionsendmsg = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/mail/write-mail.png"), tr("Send message"), this, SLOT(sendMessage())); actionsendmsg->setData( QString::fromStdString(dest->groupInfo().mMeta.mGroupId.toStdString())); - + QAction *actionsendinvite = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/mail/write-mail.png"), tr("Send invite"), this, SLOT(sendInvite())); actionsendinvite->setData( QString::fromStdString(dest->groupInfo().mMeta.mGroupId.toStdString())); - + contextMnu.addSeparator(); - + QAction *actionaddcontact = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(""), tr("Add to Contacts"), this, SLOT(addtoContacts())); actionaddcontact->setData( QString::fromStdString(dest->groupInfo().mMeta.mGroupId.toStdString())); - + contextMnu.addSeparator(); - + QAction *actionDetails = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/images/info16.png"), tr("Person details"), this, SLOT(personDetails())); actionDetails->setData( QString::fromStdString(dest->groupInfo().mMeta.mGroupId.toStdString())); @@ -599,11 +599,11 @@ void PeopleDialog::chatIdentity() RsGxsId from_gxs_id = RsGxsId(idList.at(0).toStdString()); RsGxsId gxs_id = RsGxsId(idList.at(1).toStdString()); - + uint32_t error_code ; DistantChatPeerId dpid ; - + if(!rsMsgs->initiateDistantChatConnexion(RsGxsId(gxs_id), from_gxs_id, dpid,error_code)) QMessageBox::information(NULL, tr("Distant chat cannot work"), QString("%1 %2: %3").arg(tr("Distant chat refused with this person.")).arg(tr("Error code")).arg(error_code)) ; @@ -629,7 +629,7 @@ void PeopleDialog::sendMessage() nMsgDialog->activateWindow(); /* window will destroy itself! */ - + } } @@ -642,11 +642,11 @@ void PeopleDialog::sendInvite() QString data = action->data().toString(); RsGxsId gxs_id = RsGxsId(data.toStdString());; - + MessageComposer::sendInvite(gxs_id,false); } - + } @@ -656,7 +656,7 @@ void PeopleDialog::addtoContacts() qobject_cast(QObject::sender()); if (action) { QString data = action->data().toString(); - + RsGxsId gxs_id = RsGxsId(data.toStdString());; rsIdentity->setAsRegularContact(RsGxsId(gxs_id),true); @@ -672,7 +672,7 @@ void PeopleDialog::personDetails() QString data = action->data().toString(); RsGxsId gxs_id = RsGxsId(data.toStdString()); - + if (RsGxsGroupId(gxs_id).isNull()) { return; } @@ -1075,7 +1075,7 @@ void PeopleDialog::pf_dropEventOccursInt(QDropEvent *event) dlg.addMember(idDropped->keyId(), idDropped->idtype(), idDropped->nickname(), QIcon(QPixmap::fromImage(idDropped->avatar())) ); atLeastOne = true; }//if (idDropped->havePGPDetail()) - + }//if (idDropped) }//else (cirDropped) diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp b/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp index e4228b64d..b7d6567cb 100644 --- a/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp +++ b/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp @@ -32,7 +32,7 @@ AlbumDialog::AlbumDialog(const RsPhotoAlbum& album, TokenQueue* photoQueue, RsPh ui(new Ui::AlbumDialog), mRsPhoto(rs_Photo), mPhotoShareQueue(photoQueue), mAlbum(album), mPhotoSelected(NULL) { ui->setupUi(this); - + ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/kview_64.png")); ui->headerFrame->setHeaderText(tr("Album")); diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp b/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp index 2900ad674..f5741f902 100644 --- a/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp +++ b/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp * + * retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp * * * * Copyright (C) 2020 by Robert Fernie * * * @@ -26,7 +26,7 @@ #include -const uint32_t AlbumCreateEnabledFlags = ( +const uint32_t AlbumCreateEnabledFlags = ( GXS_GROUP_FLAGS_NAME | GXS_GROUP_FLAGS_ICON | GXS_GROUP_FLAGS_DESCRIPTION | @@ -169,7 +169,7 @@ bool AlbumGroupDialog::service_loadGroup(const RsGxsGenericGroupData *data, Mode const RsPhotoAlbum& group = *pgroup; description = QString::fromUtf8(group.mDescription.c_str()); - + if (group.mThumbnail.mData) { QPixmap pixmap; if (GxsIdDetails::loadPixmapFromData(group.mThumbnail.mData, group.mThumbnail.mSize, pixmap,GxsIdDetails::ORIGINAL)) { diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoDrop.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoDrop.cpp index d8fc76e0f..61b3f90c2 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoDrop.cpp +++ b/retroshare-gui/src/gui/PhotoShare/PhotoDrop.cpp @@ -34,7 +34,7 @@ class gridIndex gridIndex(int in_row, int in_column) :row(in_row), column(in_column) { return; } - + bool operator<(const gridIndex &other) const { if (row == other.row) @@ -43,7 +43,7 @@ class gridIndex } return (row < other.row); } - + int row, column; }; @@ -73,7 +73,7 @@ PhotoItem *PhotoDrop::getSelectedPhotoItem() -void PhotoDrop::resizeEvent ( QResizeEvent * event ) +void PhotoDrop::resizeEvent ( QResizeEvent * event ) { /* calculate the preferred number of columns for the PhotoItems */ reorderPhotos(); @@ -184,7 +184,7 @@ void PhotoDrop::reorderPhotos() PhotoItem *item = dynamic_cast(litem->widget()); if (item) { - + int selectedRow; int selectedColumn; int rowSpan; @@ -195,10 +195,10 @@ void PhotoDrop::reorderPhotos() std::cerr << " layoutIdx: " << i; std::cerr << " item pos(" << selectedRow << ", " << selectedColumn; std::cerr << ")" << std::endl; - + gridIndex idx(selectedRow, selectedColumn); photoItems[idx] = item; - + } else { @@ -207,7 +207,7 @@ void PhotoDrop::reorderPhotos() } } - pit = photoItems.begin(); + pit = photoItems.begin(); if (pit == photoItems.end()) { std::cerr << "PhotoDrop::reorderPhotos() No PhotoItems."; @@ -246,7 +246,7 @@ void PhotoDrop::reorderPhotos() { glayout->removeWidget(pit->second); } - + for(pit = photoItems.begin(), i = 0; pit != photoItems.end(); ++pit, ++i) { int row = i / mColumns; @@ -279,7 +279,7 @@ void PhotoDrop::moveLeft() std::cerr << std::endl; return; } - + int count = alayout->count(); if ((!mSelected) || (count < 2)) { @@ -366,7 +366,7 @@ void PhotoDrop::moveRight() std::cerr << std::endl; return; } - + int count = alayout->count(); if ((!mSelected) || (count < 2)) { @@ -448,7 +448,7 @@ void PhotoDrop::checkMoveButtons() std::cerr << std::endl; return; } - + int count = alayout->count(); if ((!mSelected) || (count < 2)) { @@ -535,7 +535,7 @@ void PhotoDrop::clearPhotos() mSelected = NULL; } - + void PhotoDrop::dragEnterEvent(QDragEnterEvent *event) @@ -590,7 +590,7 @@ void PhotoDrop::dropEvent(QDropEvent *event) if (event->mimeData()->hasUrls()) { std::cerr << "PhotoDrop::dropEvent() Urls:" << std::endl; - + QList urls = event->mimeData()->urls(); QList::iterator uit; for (uit = urls.begin(); uit != urls.end(); ++uit) @@ -648,7 +648,7 @@ void PhotoDrop::addPhotoItem(PhotoItem *item) mPhotos.insert(item); layout()->addWidget(item); - + //checkMoveButtons(); } diff --git a/retroshare-gui/src/gui/PluginManager.cpp b/retroshare-gui/src/gui/PluginManager.cpp index e5ac7f7d5..d69b8374c 100644 --- a/retroshare-gui/src/gui/PluginManager.cpp +++ b/retroshare-gui/src/gui/PluginManager.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/PluginManager.cpp * + * retroshare-gui/src/gui/PluginManager.cpp * * * * Copyright (c) 2006 Retroshare Team * * * @@ -24,7 +24,7 @@ #include -#include //a strange thing: it compiles without this header, but +#include //a strange thing: it compiles without this header, but //then segfaults in some place #include @@ -50,10 +50,10 @@ RsApplication::dataDirectory() + "/plugins" ; } //============================================================================= - -void + +void PluginManager::defaultLoad( ) -{ +{ qDebug() << " " << "Default load started" ; QDir workDir(baseFolder); @@ -62,7 +62,7 @@ PluginManager::defaultLoad( ) { QString em= tr("base folder %1 doesn't exist, default load failed") .arg( baseFolder ); - emit errorAppeared( em ); + emit errorAppeared( em ); return ; } @@ -81,7 +81,7 @@ PluginManager::defaultLoad( ) qDebug() << " " << "can load this plugins: " << currAvailable ; - //=== + //=== foreach(QString pluginFileName, currAvailable) { QString fullfn( workDir.absoluteFilePath( pluginFileName ) ); @@ -114,7 +114,7 @@ PluginManager::readPluginInformation(QString fullFileName, QString& pluginName) } else { - //do not emit anything, cuz error message already was sent + //do not emit anything, cuz error message already was sent //from loadPluginInterface(..) return 1; //this means, some rrror appeared } @@ -122,7 +122,7 @@ PluginManager::readPluginInformation(QString fullFileName, QString& pluginName) //============================================================================= -PluginInterface* +PluginInterface* PluginManager::loadPluginInterface(QString fileName) { QString errorMessage = "Default Error Message" ; @@ -134,16 +134,16 @@ PluginManager::loadPluginInterface(QString fileName) { //qDebug() << " " << "loaded..." ; plugin = qobject_cast (pluginObject) ; - + if (plugin) { - errorMessage = "No error" ; + errorMessage = "No error" ; } else { - errorMessage = "Cast to 'PluginInterface*' failed"; + errorMessage = "Cast to 'PluginInterface*' failed"; emit errorAppeared( errorMessage ); - } + } } else { @@ -158,12 +158,12 @@ PluginManager::loadPluginInterface(QString fileName) //============================================================================= PluginManager:: ~PluginManager() -{ +{ } //============================================================================= -void +void PluginManager::acceptPlugin(QString fileName, QString pluginName) { qDebug() << " " << "accepting plugin " << pluginName; @@ -179,7 +179,7 @@ PluginManager::acceptPlugin(QString fileName, QString pluginName) //============================================================================= -QWidget* +QWidget* PluginManager::pluginWidget(QString pluginName) { QWidget* result = 0; @@ -217,30 +217,30 @@ PluginManager::pluginWidget(QString pluginName) QString em = tr("Error: no plugin with name '%1' found") .arg(pluginName); emit errorAppeared( em ); - } + } } //============================================================================= -QWidget* +QWidget* PluginManager::getViewWidget(QWidget* parent ) { if (viewWidget) return viewWidget; - + //=== else, create the viewWidget and return it // viewWidget = new PluginManagerWidget(); - + foreach(QString pn, names) { qDebug() << " " << "reg new plg " << pn; viewWidget->registerNewPlugin( pn ); } - + connect(this , SIGNAL( errorAppeared(QString) ) , viewWidget, SLOT( acceptErrorMessage( QString))); - + connect(viewWidget, SIGNAL( destroyed() ) , this , SLOT( viewWidgetDestroyed( ))); @@ -249,8 +249,8 @@ PluginManager::getViewWidget(QWidget* parent ) connect(viewWidget, SIGNAL( removeRequested( QString ) ), this , SLOT( removePlugin(QString ))); - - + + qDebug() << " PluginManager::getViewWidget done"; @@ -262,15 +262,15 @@ PluginManager::getViewWidget(QWidget* parent ) void PluginManager::viewWidgetDestroyed(QObject* obj ) -{ +{ qDebug() << " PluginManager::viewWidgetDestroyed is here"; - + viewWidget = 0; } //============================================================================= -void +void PluginManager::removePlugin(QString pluginName) { QWidget* result = 0; @@ -309,9 +309,9 @@ void PluginManager::installPlugin(QString fileName) { qDebug() << " " << "PluginManager::installPlugin is here" ; - + if (!QFile::exists( fileName) ) - { + { QString em = tr("Error (installation): plugin file %1 doesn't exist") .arg( fileName ); @@ -333,7 +333,7 @@ PluginManager::installPlugin(QString fileName) { acceptPlugin(newFileName, pn); } - } // + } // else { QString em = tr("Error: can't copy %1 to %2") diff --git a/retroshare-gui/src/gui/PluginManager.h b/retroshare-gui/src/gui/PluginManager.h index aca7b15a3..4037afe5c 100644 --- a/retroshare-gui/src/gui/PluginManager.h +++ b/retroshare-gui/src/gui/PluginManager.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/PluginManager.h * + * retroshare-gui/src/gui/PluginManager.h * * * * Copyright (c) 2006 Retroshare Team * * * @@ -71,7 +71,7 @@ public: //! PluginManager provides ablolutely no control over returned widget; //! the application should delete it, like all other widgets QWidget* pluginWidget(QString pluginName); - + //! returns last error appeared; //! Sorry, doesn't work in current implementation @@ -93,7 +93,7 @@ public slots: //! Processes plugin remove request //! 'Remove' means that plugin file (so or dll) will be physically deleted - //! from 'plugins' folder. + //! from 'plugins' folder. void removePlugin(QString pluginName); signals: @@ -116,7 +116,7 @@ signals: protected: PluginManagerWidget* viewWidget; - + QStringList fileNames; QStringList names; @@ -139,7 +139,7 @@ protected: PluginInterface* loadPluginInterface(QString fileName ) ; -}; +}; #endif diff --git a/retroshare-gui/src/gui/PluginManagerWidget.cpp b/retroshare-gui/src/gui/PluginManagerWidget.cpp index 7b5506df6..5b24be701 100644 --- a/retroshare-gui/src/gui/PluginManagerWidget.cpp +++ b/retroshare-gui/src/gui/PluginManagerWidget.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/PluginManagerWidget.cpp * + * retroshare-gui/src/gui/PluginManagerWidget.cpp * * * * Copyright (c) 2006 Retroshare Team * * * @@ -41,7 +41,7 @@ PluginFrame::PluginFrame( QString pluginName, QWidget * parent) :QFrame(parent) { plgName = pluginName; - + // labels labelsLay = new QVBoxLayout() ; nameLabel = new QLabel(); @@ -100,37 +100,37 @@ PluginFrame::getPluginName() PluginManagerWidget::PluginManagerWidget(QWidget * parent) :QFrame(parent) -{ - qDebug() << " " << "PluginManagerWidget::PluginManagerWidget here"; +{ + qDebug() << " " << "PluginManagerWidget::PluginManagerWidget here"; mainLayout = new QVBoxLayout(this); //=== installPluginLayout = new QHBoxLayout(); installPluginButton = new QPushButton(); - + installPluginButton->setText(tr("Install New Plugin...")); connect( installPluginButton, SIGNAL( clicked() ), this , SLOT( installPluginButtonClicked() ) ); installPluginLayout->addWidget(installPluginButton); - installPluginSpacer = new QSpacerItem(283, 20, + installPluginSpacer = new QSpacerItem(283, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); installPluginLayout->addItem(installPluginSpacer); mainLayout->addLayout( installPluginLayout ); - + //=== pluginFramesContainer = new QFrame(); pluginFramesLayout = new QVBoxLayout(pluginFramesContainer); - + mainLayout->addWidget(pluginFramesContainer); - + //=== errorsConsole = new QTextEdit(); - + mainLayout->addWidget( errorsConsole ); - - qDebug() << " " << "PluginManagerWidget::PluginManagerWidget done"; + + qDebug() << " " << "PluginManagerWidget::PluginManagerWidget done"; } //============================================================================= @@ -145,13 +145,13 @@ PluginManagerWidget::~PluginManagerWidget() void PluginManagerWidget::registerNewPlugin(QString pluginName) { - qDebug() << " " << "PluginManagerWidget::registerNewPlugin "<< pluginName; + qDebug() << " " << "PluginManagerWidget::registerNewPlugin "<< pluginName; PluginFrame* pf = new PluginFrame(pluginName, pluginFramesContainer) ; - + connect( pf , SIGNAL( needToRemove(QString)), this, SIGNAL( removeRequested(QString) ) ); - + pluginFramesLayout->addWidget(pf); } @@ -188,12 +188,12 @@ PluginManagerWidget::removePluginFrame(QString pluginName) // normally unreachable place QString em = tr("Widget for plugin %1 not found on plugins frame") .arg( pluginName ) ; - acceptErrorMessage( em ); + acceptErrorMessage( em ); } //============================================================================= -void +void PluginManagerWidget::acceptErrorMessage(QString errorMessage) { errorsConsole->append( errorMessage ); diff --git a/retroshare-gui/src/gui/PluginManagerWidget.h b/retroshare-gui/src/gui/PluginManagerWidget.h index 3233c5e30..314d6bbbd 100644 --- a/retroshare-gui/src/gui/PluginManagerWidget.h +++ b/retroshare-gui/src/gui/PluginManagerWidget.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/PluginManagerWidget.h * + * retroshare-gui/src/gui/PluginManagerWidget.h * * * * Copyright (c) 2006 Retroshare Team * * * @@ -34,7 +34,7 @@ class QSpacerItem; class QTextEdit; //============================================================================= - + class PluginFrame : public QFrame { Q_OBJECT @@ -47,7 +47,7 @@ public: signals: void needToRemove(QString pluginName); - + protected slots: void removeButtonClicked(); @@ -70,10 +70,10 @@ protected: //! GUI representation of the PluginManager class //! This is something like GUI for PluginManager class. Or you can think -//! about PluginManagerWidget as a view, and a PluginManager as a model. +//! about PluginManagerWidget as a view, and a PluginManager as a model. //! Instances should be created only by PluginManager class; maybe later i'll //! hide constructor in some way. Parent (or somebody else) can delete it. -//! Widget itself can be used anywere, in some 'settings' dialogs. +//! Widget itself can be used anywere, in some 'settings' dialogs. class PluginManagerWidget: public QFrame { Q_OBJECT @@ -93,7 +93,7 @@ public slots: void acceptErrorMessage(QString errorMessage); protected slots: - + protected: QVBoxLayout* mainLayout; QFrame* pluginFramesContainer; @@ -108,7 +108,7 @@ protected: protected slots: void installPluginButtonClicked(); }; - + //============================================================================= #endif diff --git a/retroshare-gui/src/gui/PluginsPage.cpp b/retroshare-gui/src/gui/PluginsPage.cpp index b992c54b7..714ab4920 100644 --- a/retroshare-gui/src/gui/PluginsPage.cpp +++ b/retroshare-gui/src/gui/PluginsPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/PluginsPage.cpp * + * retroshare-gui/src/gui/PluginsPage.cpp * * * * Copyright (c) 2006 Retroshare Team * * * @@ -42,20 +42,20 @@ #include "PluginsPage.h" #include "PluginManager.h" -//============================================================================== +//============================================================================== PluginsPage::PluginsPage(QWidget *parent ) // :QGroupBox(parent) // this is for toy applications, do not remove :MainPage(parent) // this for real retroshare app { - //=== + //=== pluginManager = new PluginManager(); connect( pluginManager, SIGNAL( newPluginRegistered(QString) ), this , SLOT( pluginRegistered(QString) ) ); - + //=== create some gui elements ===== pluginPageLayout = new QVBoxLayout(this); - + // this->setTitle("RetroShare plugins"); pluginTabs = new QTabWidget(this) ; @@ -73,8 +73,8 @@ PluginsPage::PluginsPage(QWidget *parent ) pmLay->addItem(pmSpacer); pluginTabs->addTab( pmFrame, "Manager" ) ; - - + + pluginManager->defaultLoad( ) ; } diff --git a/retroshare-gui/src/gui/PluginsPage.h b/retroshare-gui/src/gui/PluginsPage.h index 36d4f9c8a..64d257920 100644 --- a/retroshare-gui/src/gui/PluginsPage.h +++ b/retroshare-gui/src/gui/PluginsPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/PluginsPage.h * + * retroshare-gui/src/gui/PluginsPage.h * * * * Copyright (c) 2006 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/Posted/PhotoView.cpp b/retroshare-gui/src/gui/Posted/PhotoView.cpp index 0c45914f4..9a930a393 100644 --- a/retroshare-gui/src/gui/Posted/PhotoView.cpp +++ b/retroshare-gui/src/gui/Posted/PhotoView.cpp @@ -39,7 +39,7 @@ PhotoView::PhotoView(QWidget *parent) ui->setupUi(this); setAttribute(Qt::WA_DeleteOnClose, true); - + connect(ui->shareButton, SIGNAL(clicked()), this, SLOT(copyMessageLink())); } @@ -49,21 +49,21 @@ PhotoView::~PhotoView() delete ui; } -void PhotoView::setPixmap(const QPixmap& pixmap) +void PhotoView::setPixmap(const QPixmap& pixmap) { ui->photoLabel->setPixmap(pixmap); this->adjustSize(); } -void PhotoView::setTitle(const QString& text) +void PhotoView::setTitle(const QString& text) { ui->titleLabel->setText(text); } -void PhotoView::setName(const RsGxsId& authorID) +void PhotoView::setName(const RsGxsId& authorID) { ui->nameLabel->setId(authorID); - + RsIdentityDetails idDetails ; rsIdentity->getIdDetails(authorID,idDetails); @@ -71,21 +71,21 @@ void PhotoView::setName(const RsGxsId& authorID) if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) pixmap = GxsIdDetails::makeDefaultIcon(authorID,GxsIdDetails::SMALL); - + ui->avatarWidget->setPixmap(pixmap); } -void PhotoView::setTime(const QString& text) +void PhotoView::setTime(const QString& text) { ui->timeLabel->setText(text); } -void PhotoView::setGroupId(const RsGxsGroupId &groupId) +void PhotoView::setGroupId(const RsGxsGroupId &groupId) { mGroupId = groupId; } -void PhotoView::setMessageId(const RsGxsMessageId& messageId) +void PhotoView::setMessageId(const RsGxsMessageId& messageId) { mMessageId = messageId ; } diff --git a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp index f2b011adb..5f36ad9fb 100644 --- a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp +++ b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp @@ -27,7 +27,7 @@ #include "retroshare/rswiki.h" #include -const uint32_t PostedCreateEnabledFlags = ( +const uint32_t PostedCreateEnabledFlags = ( GXS_GROUP_FLAGS_NAME | GXS_GROUP_FLAGS_ICON | GXS_GROUP_FLAGS_DESCRIPTION | @@ -154,7 +154,7 @@ bool PostedGroupDialog::service_loadGroup(const RsGxsGenericGroupData *data, Mod const RsPostedGroup& group = *pgroup; description = QString::fromUtf8(group.mDescription.c_str()); - + if (group.mGroupImage.mData) { QPixmap pixmap; diff --git a/retroshare-gui/src/gui/QuickStartWizard.cpp b/retroshare-gui/src/gui/QuickStartWizard.cpp index 1b74bbb34..0ed63f44b 100644 --- a/retroshare-gui/src/gui/QuickStartWizard.cpp +++ b/retroshare-gui/src/gui/QuickStartWizard.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/QuikStartWizard.cpp * + * retroshare-gui/src/gui/QuikStartWizard.cpp * * * * Copyright (c) 2006 Retroshare Team * * * @@ -10,7 +10,7 @@ * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Affero General Public License for more details. * * * * You should have received a copy of the GNU Affero General Public License * @@ -47,27 +47,27 @@ QuickStartWizard::QuickStartWizard(QWidget *parent) : ui.headerFrame->setHeaderText("RetroShare"); ui.pagesWizard->setCurrentIndex(0); - + loadNetwork(); loadShare(); loadGeneral(); - + // ui.checkBoxF2FRouting->setChecked(true) ; // ui.checkBoxF2FRouting->setEnabled(false) ; - + connect( ui.netModeComboBox, SIGNAL( activated(int) ), this, SLOT( toggleUPnP() ) ); // connect( ui.checkBoxTunnelConnection, SIGNAL( toggled( bool ) ), this, SLOT( toggleTunnelConnection(bool) ) ); - + // bool b = rsPeers->getAllowTunnelConnection() ; // ui.checkBoxTunnelConnection->setChecked(b) ; - + QHeaderView_setSectionResizeModeColumn(ui.shareddirList->horizontalHeader(), 0, QHeaderView::Stretch); QHeaderView_setSectionResizeModeColumn(ui.shareddirList->horizontalHeader(), 2, QHeaderView::Interactive); - + ui.shareddirList->horizontalHeader()->resizeSection( 0, 360 ); ui.shareddirList->horizontalHeader()->setStretchLastSection(false); - + /* Hide platform specific features */ #ifndef Q_OS_WIN ui.checkBoxRunRetroshareAtSystemStartup->setVisible(false); @@ -148,7 +148,7 @@ void QuickStartWizard::on_pushButtonConnectionNext_clicked() vs_dht = RS_VS_DHT_OFF; break; } - + RsPeerDetails detail; if (!rsPeers->getPeerDetails(rsPeers->getOwnId(), detail)) @@ -159,7 +159,7 @@ void QuickStartWizard::on_pushButtonConnectionNext_clicked() { rsPeers->setVisState(rsPeers->getOwnId(), vs_disc, vs_dht); } - + rsConfig->SetMaxDataRates( ui.doubleSpinBoxDownloadSpeed->value(), ui.doubleSpinBoxUploadSpeed->value() ); ui.pagesWizard->setCurrentIndex(2); @@ -215,7 +215,7 @@ void QuickStartWizard::on_pushButtonSystemFinish_clicked() #endif saveChanges(); - + close(); } @@ -407,7 +407,7 @@ QuickStartWizard::loadGeneral() ui.checkBoxStartMinimized->setChecked(Settings->getStartMinimized()); ui.checkBoxQuit->setChecked(Settings->value("doQuit", false).toBool()); - + ui.rbtPageOnToolBar->setChecked(Settings->getPageButtonLoc()); ui.rbtPageOnListItem->setChecked(!Settings->getPageButtonLoc()); @@ -484,7 +484,7 @@ void QuickStartWizard::loadNetwork() netIndex = 3; // NONE } } - + ui.discoveryComboBox->setCurrentIndex(netIndex); int dlrate = 0; @@ -532,7 +532,7 @@ void QuickStartWizard::saveChanges() netMode = RS_NETMODE_UPNP; break; } - + rsPeers->setNetworkMode(ownId, netMode); /* Check if vis has changed */ @@ -558,7 +558,7 @@ void QuickStartWizard::saveChanges() vs_dht = RS_VS_DHT_OFF; break; } - + if ((vs_disc != detail.vs_disc) || (vs_dht != detail.vs_dht)) { rsPeers->setVisState(ownId, vs_disc, vs_dht); diff --git a/retroshare-gui/src/gui/QuickStartWizard.h b/retroshare-gui/src/gui/QuickStartWizard.h index 0c9ace385..f5544dfb0 100644 --- a/retroshare-gui/src/gui/QuickStartWizard.h +++ b/retroshare-gui/src/gui/QuickStartWizard.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/QuikStartWizard.h * + * retroshare-gui/src/gui/QuikStartWizard.h * * * * Copyright (c) 2006 Retroshare Team * * * @@ -27,17 +27,17 @@ #include "ui_QuickStartWizard.h" -class QuickStartWizard : public QDialog +class QuickStartWizard : public QDialog { Q_OBJECT Q_DISABLE_COPY(QuickStartWizard) - + public: explicit QuickStartWizard(QWidget *parent = 0); virtual ~QuickStartWizard(); - + void loadNetwork(); - void loadShare(); + void loadShare(); void loadGeneral(); protected: @@ -46,7 +46,7 @@ protected: private: Ui::QuickStartWizard ui; - + bool messageBoxOk(QString); private Q_SLOTS: @@ -67,7 +67,7 @@ private Q_SLOTS: void on_pushButtonConnectionExit_clicked(); void on_pushButtonConnectionNext_clicked(); void on_pushButtonConnectionBack_clicked(); - + void updateFlags(bool); void saveChanges(); //void toggleUPnP(); diff --git a/retroshare-gui/src/gui/RSHumanReadableDelegate.h b/retroshare-gui/src/gui/RSHumanReadableDelegate.h index 1688ce782..78ce1c2bb 100644 --- a/retroshare-gui/src/gui/RSHumanReadableDelegate.h +++ b/retroshare-gui/src/gui/RSHumanReadableDelegate.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/RSHumanReadableDelegate.h * + * retroshare-gui/src/gui/RSHumanReadableDelegate.h * * * * Copyright (c) 2010 Cyril Soler * * * @@ -18,19 +18,19 @@ * * *******************************************************************************/ -/** Use this class for displaying dates and sizes in a readable format, while allowing to read the +/** Use this class for displaying dates and sizes in a readable format, while allowing to read the * real size in the column. * * To use: * - * - in the QABstractItemView constructor, do a + * - in the QABstractItemView constructor, do a * * myView->setItemDelegateForColumn(SR_SIZE_COL,new RSHumanReadableSizeDelegate()) ; * * - each field must be filled with a string that allows a proper sorting based on lexicographic * order. For Sizes, use this: * - * myView->setText(SR_SIZE_COL, QString("%1").arg(dir.count,(int)15,(int)10)); + * myView->setText(SR_SIZE_COL, QString("%1").arg(dir.count,(int)15,(int)10)); * * Note: there's no .cpp file, because the code here is really simple. */ @@ -42,7 +42,7 @@ class RSHumanReadableDelegate: public QAbstractItemDelegate { public: - virtual QSize sizeHint(const QStyleOptionViewItem&, const QModelIndex&) const + virtual QSize sizeHint(const QStyleOptionViewItem&, const QModelIndex&) const { return QSize(50,17) ; } @@ -56,28 +56,28 @@ class RSHumanReadableDelegate: public QAbstractItemDelegate QPalette::ColorGroup cg = option.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled; QVariant value = index.data(Qt::ForegroundRole); - if(value.isValid() && qvariant_cast(value).isValid()) + if(value.isValid() && qvariant_cast(value).isValid()) option.palette.setColor(QPalette::Text, qvariant_cast(value)); // select pen color if(option.state & QStyle::State_Selected) painter->setPen(option.palette.color(cg, QPalette::HighlightedText)); - else + else painter->setPen(option.palette.color(cg, QPalette::Text)); - // draw the background color - if(option.showDecorationSelected && (option.state & QStyle::State_Selected)) + // draw the background color + if(option.showDecorationSelected && (option.state & QStyle::State_Selected)) { - if(cg == QPalette::Normal && !(option.state & QStyle::State_Active)) + if(cg == QPalette::Normal && !(option.state & QStyle::State_Active)) cg = QPalette::Inactive; painter->fillRect(option.rect, option.palette.brush(cg, QPalette::Highlight)); - } - else + } + else { value = index.data(Qt::BackgroundRole); - if(value.isValid() && qvariant_cast(value).isValid()) + if(value.isValid() && qvariant_cast(value).isValid()) painter->fillRect(option.rect, qvariant_cast(value)); } } diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp index 9aa1386ee..e2b178694 100644 --- a/retroshare-gui/src/gui/RemoteDirModel.cpp +++ b/retroshare-gui/src/gui/RemoteDirModel.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/RemoteDirModel.cpp * + * retroshare-gui/src/gui/RemoteDirModel.cpp * * * * Copyright (c) 2006 Retroshare Team * * * @@ -334,7 +334,7 @@ QString RetroshareDirModel::getGroupsString(FileStorageFlags flags,const std::li RsGroupInfo group_info ; for(std::list::const_iterator it(group_ids.begin());it!=group_ids.end();) - if(rsPeers->getGroupInfo(*it,group_info)) + if(rsPeers->getGroupInfo(*it,group_info)) { groups_str += GroupDefs::name(group_info) ; @@ -671,7 +671,7 @@ QString FlatStyle_RDM::computeDirectoryPath(const DirDetails& details) const } while(det->parent != NULL); #endif - + return dir ; } @@ -1417,7 +1417,7 @@ void RetroshareDirModel::getFileInfoFromIndexList(const QModelIndexList& list, s std::cerr << "Path: " << details.path << std::endl; #endif // Note: for directories, the returned hash, is the peer id, so if we collect - // dirs, we need to be a bit more conservative for the + // dirs, we need to be a bit more conservative for the if(already_in.find(details.hash.toStdString()+details.name) == already_in.end()) { diff --git a/retroshare-gui/src/gui/RemoteDirModel.h b/retroshare-gui/src/gui/RemoteDirModel.h index b7811533e..213480ee1 100644 --- a/retroshare-gui/src/gui/RemoteDirModel.h +++ b/retroshare-gui/src/gui/RemoteDirModel.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/RemoteDirModel.h * + * retroshare-gui/src/gui/RemoteDirModel.h * * * * Copyright (c) 2006 Retroshare Team * * * @@ -219,7 +219,7 @@ class TreeStyle_RDM: public RetroshareDirModel // class FlatStyle_RDM: public RetroshareDirModel { - Q_OBJECT + Q_OBJECT public: FlatStyle_RDM(bool mode); diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp index a22f9ced8..26b664f4f 100644 --- a/retroshare-gui/src/gui/RetroShareLink.cpp +++ b/retroshare-gui/src/gui/RetroShareLink.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/RetroshareLink.cpp * + * retroshare-gui/src/gui/RetroshareLink.cpp * * * * Copyright (c) 2009 Cyril Soler * * * diff --git a/retroshare-gui/src/gui/RetroShareLink.h b/retroshare-gui/src/gui/RetroShareLink.h index 61c794b11..90b6d8b16 100644 --- a/retroshare-gui/src/gui/RetroShareLink.h +++ b/retroshare-gui/src/gui/RetroShareLink.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/RetroshareLink.h * + * retroshare-gui/src/gui/RetroshareLink.h * * * * Copyright (c) 2009 Cyril Soler * * * diff --git a/retroshare-gui/src/gui/RsAutoUpdatePage.cpp b/retroshare-gui/src/gui/RsAutoUpdatePage.cpp index 4c18d294b..93f4fd7fa 100644 --- a/retroshare-gui/src/gui/RsAutoUpdatePage.cpp +++ b/retroshare-gui/src/gui/RsAutoUpdatePage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/RsAutoUpdatePage.cpp * + * retroshare-gui/src/gui/RsAutoUpdatePage.cpp * * * * Copyright (c) 2009 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/RsGUIEventManager.cpp b/retroshare-gui/src/gui/RsGUIEventManager.cpp index 73bdb8a3a..cc9ccdefe 100644 --- a/retroshare-gui/src/gui/RsGUIEventManager.cpp +++ b/retroshare-gui/src/gui/RsGUIEventManager.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/RsGUIEventManager.cpp * + * retroshare-gui/src/gui/RsGUIEventManager.cpp * * * * Copyright (c) 2010 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/RsGUIEventManager.h b/retroshare-gui/src/gui/RsGUIEventManager.h index 2ae4ab464..5d3da9bdb 100644 --- a/retroshare-gui/src/gui/RsGUIEventManager.h +++ b/retroshare-gui/src/gui/RsGUIEventManager.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/RsGUIEventManager.h * + * retroshare-gui/src/gui/RsGUIEventManager.h * * * * Copyright (c) 2010 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/SearchTreeWidget.cpp b/retroshare-gui/src/gui/SearchTreeWidget.cpp index 217f15777..06e517a26 100644 --- a/retroshare-gui/src/gui/SearchTreeWidget.cpp +++ b/retroshare-gui/src/gui/SearchTreeWidget.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/SearchTreeWidget.cpp * + * retroshare-gui/src/gui/SearchTreeWidget.cpp * * * * Copyright (c) 2008 Robert Fernie * * * @@ -68,7 +68,7 @@ QMimeData * SearchTreeWidget::mimeData ( const QList items ) -QStringList SearchTreeWidget::mimeTypes () const +QStringList SearchTreeWidget::mimeTypes () const { QStringList list; list.push_back("application/x-rsfilelist"); diff --git a/retroshare-gui/src/gui/SearchTreeWidget.h b/retroshare-gui/src/gui/SearchTreeWidget.h index cc9420c5a..5bf1bed65 100644 --- a/retroshare-gui/src/gui/SearchTreeWidget.h +++ b/retroshare-gui/src/gui/SearchTreeWidget.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/SearchTreeWidget.h * + * retroshare-gui/src/gui/SearchTreeWidget.h * * * * Copyright (c) 2008 Robert Fernie * * * @@ -40,13 +40,13 @@ class SearchTreeWidget : public QTreeWidget { Q_OBJECT - + public: SearchTreeWidget(QWidget *parent = 0); protected: virtual QMimeData * mimeData ( const QList items ) const; -virtual QStringList mimeTypes () const; +virtual QStringList mimeTypes () const; virtual Qt::DropActions supportedDropActions () const; }; diff --git a/retroshare-gui/src/gui/ServicePermissionDialog.cpp b/retroshare-gui/src/gui/ServicePermissionDialog.cpp index 9eb898058..1be1968f0 100644 --- a/retroshare-gui/src/gui/ServicePermissionDialog.cpp +++ b/retroshare-gui/src/gui/ServicePermissionDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/ServicePermissionDialog.cpp * + * retroshare-gui/src/gui/ServicePermissionDialog.cpp * * * * Copyright (c) 2013 Retroshare Team * * * @@ -36,7 +36,7 @@ ServicePermissionDialog::ServicePermissionDialog() : setAttribute(Qt::WA_DeleteOnClose, true); Settings->loadWidgetInformation(this); - + ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/user/servicepermissions64.png")); ui->headerFrame->setHeaderText(tr("Service Permissions")); diff --git a/retroshare-gui/src/gui/ServicePermissionDialog.h b/retroshare-gui/src/gui/ServicePermissionDialog.h index dcdd01ed8..35690c0d8 100644 --- a/retroshare-gui/src/gui/ServicePermissionDialog.h +++ b/retroshare-gui/src/gui/ServicePermissionDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/ServicePermissionDialog.h * + * retroshare-gui/src/gui/ServicePermissionDialog.h * * * * Copyright (c) 2013 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/ShareManager.cpp b/retroshare-gui/src/gui/ShareManager.cpp index d4426d3ae..64817864a 100644 --- a/retroshare-gui/src/gui/ShareManager.cpp +++ b/retroshare-gui/src/gui/ShareManager.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/ShareManager.cpp * + * retroshare-gui/src/gui/ShareManager.cpp * * * * Copyright (c) 2006 Crypton * * * diff --git a/retroshare-gui/src/gui/ShareManager.h b/retroshare-gui/src/gui/ShareManager.h index b6d579894..5433a38a1 100644 --- a/retroshare-gui/src/gui/ShareManager.h +++ b/retroshare-gui/src/gui/ShareManager.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/ShareManager.h * + * retroshare-gui/src/gui/ShareManager.h * * * * Copyright (c) 2006 Crypton * * * diff --git a/retroshare-gui/src/gui/SoundManager.cpp b/retroshare-gui/src/gui/SoundManager.cpp index 3fc60dd87..878de1ef6 100644 --- a/retroshare-gui/src/gui/SoundManager.cpp +++ b/retroshare-gui/src/gui/SoundManager.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/SoundManager.cpp * + * retroshare-gui/src/gui/SoundManager.cpp * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/SoundManager.h b/retroshare-gui/src/gui/SoundManager.h index eeceb3048..8fe07f1b2 100644 --- a/retroshare-gui/src/gui/SoundManager.h +++ b/retroshare-gui/src/gui/SoundManager.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/SoundManager.h * + * retroshare-gui/src/gui/SoundManager.h * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp index f52179c39..9b33a3244 100644 --- a/retroshare-gui/src/gui/StartDialog.cpp +++ b/retroshare-gui/src/gui/StartDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/StartDialog.cpp * + * retroshare-gui/src/gui/StartDialog.cpp * * * * Copyright (c) 2006 Crypton * * * @@ -45,7 +45,7 @@ StartDialog::StartDialog(QWidget *parent) #endif Settings->loadWidgetInformation(this); - + /* Put the Login dialog in the screen center */ const QRect screen = RsApplication::primaryScreenGeometry(); this->move( screen.center() - this->rect().center() ); diff --git a/retroshare-gui/src/gui/StartDialog.h b/retroshare-gui/src/gui/StartDialog.h index 6d4390efb..a40d15776 100644 --- a/retroshare-gui/src/gui/StartDialog.h +++ b/retroshare-gui/src/gui/StartDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/StartDialog.h * + * retroshare-gui/src/gui/StartDialog.h * * * * Copyright (c) 2006 Crypton * * * diff --git a/retroshare-gui/src/gui/TheWire/CustomFrame.cpp b/retroshare-gui/src/gui/TheWire/CustomFrame.cpp index 4f1308df5..9a8d8b174 100644 --- a/retroshare-gui/src/gui/TheWire/CustomFrame.cpp +++ b/retroshare-gui/src/gui/TheWire/CustomFrame.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/CustomFrame.cpp * + * retroshare-gui/src/gui/TheWire/CustomFrame.cpp * * * * Copyright (c) 2012-2020 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/TheWire/CustomFrame.h b/retroshare-gui/src/gui/TheWire/CustomFrame.h index e75a6087a..64972a36e 100644 --- a/retroshare-gui/src/gui/TheWire/CustomFrame.h +++ b/retroshare-gui/src/gui/TheWire/CustomFrame.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/CustomFrame.h * + * retroshare-gui/src/gui/TheWire/CustomFrame.h * * * * Copyright (c) 2012-2020 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp index d3b666a7e..43d6bb182 100644 --- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp +++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/PulseAddDialog.cpp * + * retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp * * * * Copyright (c) 2012-2020 Robert Fernie * * * @@ -71,7 +71,7 @@ void PulseAddDialog::setGroup(RsWireGroup &group) { ui.label_groupName->setText(QString::fromStdString(group.mMeta.mGroupName)); ui.label_idName->setText(QString::fromStdString(group.mMeta.mAuthorId.toStdString())); - + if (group.mHeadshot.mData ) { QPixmap pixmap; @@ -92,7 +92,7 @@ void PulseAddDialog::setGroup(RsWireGroup &group) ui.headshot->setPixmap(pixmap); ui.topheadshot->setPixmap(pixmap); } - + mGroup = group; } diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.h b/retroshare-gui/src/gui/TheWire/PulseAddDialog.h index b1e8eca47..e2b8203c5 100644 --- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.h +++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/PulseAddDialog.h * + * retroshare-gui/src/gui/TheWire/PulseAddDialog.h * * * * Copyright (c) 2012-2020 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/TheWire/PulseMessage.cpp b/retroshare-gui/src/gui/TheWire/PulseMessage.cpp index 34724282f..aaa44d911 100644 --- a/retroshare-gui/src/gui/TheWire/PulseMessage.cpp +++ b/retroshare-gui/src/gui/TheWire/PulseMessage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/PulseMessage.cpp * + * retroshare-gui/src/gui/TheWire/PulseMessage.cpp * * * * Copyright (c) 2020-2020 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/TheWire/PulseMessage.h b/retroshare-gui/src/gui/TheWire/PulseMessage.h index 234f0da02..9564eba76 100644 --- a/retroshare-gui/src/gui/TheWire/PulseMessage.h +++ b/retroshare-gui/src/gui/TheWire/PulseMessage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/PulseMessage.h * + * retroshare-gui/src/gui/TheWire/PulseMessage.h * * * * Copyright (c) 2020-2020 Robert Fernie * * * @@ -30,7 +30,7 @@ class PulseMessage : public QWidget, private Ui::PulseMessage Q_OBJECT public: - PulseMessage(QWidget *parent); + PulseMessage(QWidget *parent); void setup(RsWirePulseSPtr pulse); void setMessage(QString msg); diff --git a/retroshare-gui/src/gui/TheWire/PulseReply.cpp b/retroshare-gui/src/gui/TheWire/PulseReply.cpp index 5067b5f9b..8f6ffae0e 100644 --- a/retroshare-gui/src/gui/TheWire/PulseReply.cpp +++ b/retroshare-gui/src/gui/TheWire/PulseReply.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/PulseReply.cpp * + * retroshare-gui/src/gui/TheWire/PulseReply.cpp * * * * Copyright (c) 2020-2020 Robert Fernie * * * @@ -111,7 +111,7 @@ void PulseReply::setRepublishesString(QString repub) void PulseReply::setRepliesString(QString reply) { - label_replies->setText(reply); + label_replies->setText(reply); } void PulseReply::setPulseStatus(PulseStatus status) diff --git a/retroshare-gui/src/gui/TheWire/PulseReply.h b/retroshare-gui/src/gui/TheWire/PulseReply.h index c2c9545f5..1dec51ef4 100644 --- a/retroshare-gui/src/gui/TheWire/PulseReply.h +++ b/retroshare-gui/src/gui/TheWire/PulseReply.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/PulseReply.h * + * retroshare-gui/src/gui/TheWire/PulseReply.h * * * * Copyright (c) 2020-2020 Robert Fernie * * * @@ -54,7 +54,7 @@ protected: virtual void setRepublishesString(QString repub) override; virtual void setRepliesString(QString reply) override; - // + // virtual void setReferenceString(QString ref) override; virtual void setPulseStatus(PulseStatus status) override; // PulseDataInterface =========== diff --git a/retroshare-gui/src/gui/TheWire/PulseReplySeperator.cpp b/retroshare-gui/src/gui/TheWire/PulseReplySeperator.cpp index e9bf0d3e9..809373fd8 100644 --- a/retroshare-gui/src/gui/TheWire/PulseReplySeperator.cpp +++ b/retroshare-gui/src/gui/TheWire/PulseReplySeperator.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/PulseReplySeperator.cpp * + * retroshare-gui/src/gui/TheWire/PulseReplySeperator.cpp * * * * Copyright (c) 2020-2020 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/TheWire/PulseReplySeperator.h b/retroshare-gui/src/gui/TheWire/PulseReplySeperator.h index 08b236a0c..78b6ad471 100644 --- a/retroshare-gui/src/gui/TheWire/PulseReplySeperator.h +++ b/retroshare-gui/src/gui/TheWire/PulseReplySeperator.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/PulseReplySeperator.h * + * retroshare-gui/src/gui/TheWire/PulseReplySeperator.h * * * * Copyright (c) 2020-2020 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp b/retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp index 0948e745b..0e49daa49 100644 --- a/retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp +++ b/retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/PulseTopLevel.cpp * + * retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp * * * * Copyright (c) 2020-2020 Robert Fernie * * * @@ -107,7 +107,7 @@ void PulseTopLevel::setRepliesString(QString reply) label_extra_replies->setText(BoldString(reply)); label_replies->setText(reply); } - + void PulseTopLevel::setPulseStatus(PulseStatus status) { widget_replies->setVisible(true); // this is only reachable if we have ORIG so show always. @@ -148,7 +148,7 @@ void PulseTopLevel::setReferenceString(QString ref) toolButton_followParent->setVisible(false); } } - + void PulseTopLevel::mousePressEvent(QMouseEvent */*event*/) { } diff --git a/retroshare-gui/src/gui/TheWire/PulseTopLevel.h b/retroshare-gui/src/gui/TheWire/PulseTopLevel.h index c04550023..2b86c4cef 100644 --- a/retroshare-gui/src/gui/TheWire/PulseTopLevel.h +++ b/retroshare-gui/src/gui/TheWire/PulseTopLevel.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/PulseTopLevel.h * + * retroshare-gui/src/gui/TheWire/PulseTopLevel.h * * * * Copyright (c) 2020-2020 Robert Fernie * * * @@ -53,7 +53,7 @@ protected: virtual void setRepublishesString(QString repub) override; virtual void setRepliesString(QString reply) override; - // + // virtual void setReferenceString(QString ref) override; virtual void setPulseStatus(PulseStatus status) override; // PulseDataInterface =========== diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp index 475c74034..6c3a5c8d2 100644 --- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp +++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/PulseViewGroup.cpp * + * retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp * * * * Copyright (c) 2012-2020 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.h b/retroshare-gui/src/gui/TheWire/PulseViewGroup.h index 62da0a228..2c5a225cd 100644 --- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.h +++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/PulseViewGroup.h * + * retroshare-gui/src/gui/TheWire/PulseViewGroup.h * * * * Copyright (c) 2020-2020 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp b/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp index b46737bfd..7a9e4d2e2 100644 --- a/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp +++ b/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/PulseViewItem.cpp * + * retroshare-gui/src/gui/TheWire/PulseViewItem.cpp * * * * Copyright (c) 2012-2020 Robert Fernie * * * @@ -331,8 +331,8 @@ void PulseDataItem::showPulse() { QPixmap pixmap; if (GxsIdDetails::loadPixmapFromData( - mPulse->mGroupPtr->mHeadshot.mData, - mPulse->mGroupPtr->mHeadshot.mSize, + mPulse->mGroupPtr->mHeadshot.mData, + mPulse->mGroupPtr->mHeadshot.mSize, pixmap,GxsIdDetails::ORIGINAL)) { headshotOkay = true; @@ -344,7 +344,7 @@ void PulseDataItem::showPulse() setGroupName("GroupName UNKNOWN"); } - if (!headshotOkay) + if (!headshotOkay) { // default. QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png").scaled(50,50); diff --git a/retroshare-gui/src/gui/TheWire/PulseViewItem.h b/retroshare-gui/src/gui/TheWire/PulseViewItem.h index bee96f14b..f73caafb5 100644 --- a/retroshare-gui/src/gui/TheWire/PulseViewItem.h +++ b/retroshare-gui/src/gui/TheWire/PulseViewItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/PulseViewItem.h * + * retroshare-gui/src/gui/TheWire/PulseViewItem.h * * * * Copyright (c) 2020-2020 Robert Fernie * * * @@ -73,7 +73,7 @@ protected: virtual void setRepublishesString(QString repub) = 0; virtual void setRepliesString(QString reply) = 0; - // + // virtual void setReferenceString(QString ref) = 0; virtual void setPulseStatus(PulseStatus status) = 0; }; @@ -134,7 +134,7 @@ protected: void setRepublishes(uint32_t count); void setReplies(uint32_t count); - // + // void setReference(uint32_t flags, RsGxsGroupId groupId, std::string groupName); // DATA. diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.cpp b/retroshare-gui/src/gui/TheWire/WireDialog.cpp index 36a201a7f..0cc875991 100644 --- a/retroshare-gui/src/gui/TheWire/WireDialog.cpp +++ b/retroshare-gui/src/gui/TheWire/WireDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/WireDialog.cpp * + * retroshare-gui/src/gui/TheWire/WireDialog.cpp * * * * Copyright (c) 2012-2020 Robert Fernie * * * @@ -138,7 +138,7 @@ WireDialog::~WireDialog() { // save settings processSettings(false); - + clearTwitterView(); std::cerr << "WireDialog::~WireDialog()" << std::endl; delete(mWireQueue); @@ -360,14 +360,14 @@ void WireDialog::updateGroups(std::vector& groups) { // grab own groups. // setup Chooser too. - mOwnGroups.push_back(it); + mOwnGroups.push_back(it); QPixmap pixmap; if (it.mHeadshot.mData) { if (GxsIdDetails::loadPixmapFromData( it.mHeadshot.mData,it.mHeadshot.mSize,pixmap,GxsIdDetails::ORIGINAL)) pixmap = pixmap.scaled(32,32); - } - else + } + else { // default. pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/wire.png").scaled(32,32); @@ -691,7 +691,7 @@ void WireDialog::postTestTwitterView() clearTwitterView(); std::cerr << "WireDialog::postTestTwitterView()" << std::endl; - addTwitterView(new PulseTopLevel(NULL,RsWirePulseSPtr())); + addTwitterView(new PulseTopLevel(NULL,RsWirePulseSPtr())); addTwitterView(new PulseReply(NULL,RsWirePulseSPtr())); addTwitterView(new PulseReply(NULL,RsWirePulseSPtr())); addTwitterView(new PulseReply(NULL,RsWirePulseSPtr())); diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.h b/retroshare-gui/src/gui/TheWire/WireDialog.h index fcd33ad37..29b7d49ab 100644 --- a/retroshare-gui/src/gui/TheWire/WireDialog.h +++ b/retroshare-gui/src/gui/TheWire/WireDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/WireDialog.h * + * retroshare-gui/src/gui/TheWire/WireDialog.h * * * * Copyright (c) 2012-2020 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp index e832540de..97b5ba011 100644 --- a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp +++ b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/WireGroupDialog.cpp * + * retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp * * * * Copyright (C) 2020 by Robert Fernie * * * @@ -27,7 +27,7 @@ #include -const uint32_t WireCreateEnabledFlags = ( +const uint32_t WireCreateEnabledFlags = ( GXS_GROUP_FLAGS_NAME | GXS_GROUP_FLAGS_ICON | // GXS_GROUP_FLAGS_DESCRIPTION | diff --git a/retroshare-gui/src/gui/TheWire/WireGroupDialog.h b/retroshare-gui/src/gui/TheWire/WireGroupDialog.h index ca3f59e73..3aafae5a6 100644 --- a/retroshare-gui/src/gui/TheWire/WireGroupDialog.h +++ b/retroshare-gui/src/gui/TheWire/WireGroupDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/WireGroupDialog.h * + * retroshare-gui/src/gui/TheWire/WireGroupDialog.h * * * * Copyright (C) 2020 by Robert Fernie * * * diff --git a/retroshare-gui/src/gui/TheWire/WireGroupExtra.cpp b/retroshare-gui/src/gui/TheWire/WireGroupExtra.cpp index 8ed6d4d4b..d1fe9ac28 100644 --- a/retroshare-gui/src/gui/TheWire/WireGroupExtra.cpp +++ b/retroshare-gui/src/gui/TheWire/WireGroupExtra.cpp @@ -37,7 +37,7 @@ void WireGroupExtra::setUp() connect(ui.pushButton_masthead, SIGNAL(clicked() ), this , SLOT(addMasthead())); int desired_height = ui.pushButton_masthead->height() + ui.removeButton->height() + ui.lineEdit_Tagline->height(); - int desired_width = 3/1.0 * desired_height + ui.lineEdit_Tagline->width(); + int desired_width = 3/1.0 * desired_height + ui.lineEdit_Tagline->width(); ui.label_masthead->setFixedSize(desired_width, desired_height); diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp index 1759103f6..6da545032 100644 --- a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp +++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/WireGroupItem.cpp * + * retroshare-gui/src/gui/TheWire/WireGroupItem.cpp * * * * Copyright (c) 2020 Robert Fernie * * * @@ -102,7 +102,7 @@ void WireGroupItem::setup() QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/wire.png").scaled(32,32, Qt::KeepAspectRatio, Qt::SmoothTransformation); label_headshot->setPixmap(pixmap); } - + RsIdentityDetails idDetails ; rsIdentity->getIdDetails(mGroup.mMeta.mAuthorId,idDetails); @@ -168,7 +168,7 @@ void WireGroupItem::setSelected(bool on) { mSelected = on; // set color too - if (mSelected) + if (mSelected) { setBackground(QColor (65, 159, 217)); } diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.h b/retroshare-gui/src/gui/TheWire/WireGroupItem.h index a7ae14326..6539bfe7a 100644 --- a/retroshare-gui/src/gui/TheWire/WireGroupItem.h +++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/TheWire/WireGroupItem.h * + * retroshare-gui/src/gui/TheWire/WireGroupItem.h * * * * Copyright (c) 2020 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/TrustView.h b/retroshare-gui/src/gui/TrustView.h index 25176057c..e7238d39c 100644 --- a/retroshare-gui/src/gui/TrustView.h +++ b/retroshare-gui/src/gui/TrustView.h @@ -1,3 +1,5 @@ +#pragma once + #include "ui_TrustView.h" #include diff --git a/retroshare-gui/src/gui/WikiPoos/WikiAddDialog.cpp b/retroshare-gui/src/gui/WikiPoos/WikiAddDialog.cpp index 51b7e3814..81c712ac6 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiAddDialog.cpp +++ b/retroshare-gui/src/gui/WikiPoos/WikiAddDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/WikiPoos/WikiAddDialog.cpp * + * retroshare-gui/src/gui/WikiPoos/WikiAddDialog.cpp * * * * Copyright (C) 2012 Robert Fernie * * * @@ -82,4 +82,4 @@ void WikiAddDialog::clearDialog() ui.lineEdit_Name->setText(QString("title")); } - + diff --git a/retroshare-gui/src/gui/WikiPoos/WikiAddDialog.h b/retroshare-gui/src/gui/WikiPoos/WikiAddDialog.h index 7e13e233c..b2d1f2ea7 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiAddDialog.h +++ b/retroshare-gui/src/gui/WikiPoos/WikiAddDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/WikiPoos/WikiAddDialog.h * + * retroshare-gui/src/gui/WikiPoos/WikiAddDialog.h * * * * Copyright (C) 2012 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/WikiPoos/WikiDialog.h b/retroshare-gui/src/gui/WikiPoos/WikiDialog.h index 7d03bca7e..abc8daf33 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiDialog.h +++ b/retroshare-gui/src/gui/WikiPoos/WikiDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/WikiPoos/WikiDialog.h * + * retroshare-gui/src/gui/WikiPoos/WikiDialog.h * * * * Copyright (C) 2012 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp index 857ad0da8..c4f69d1e1 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp +++ b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/WikiPoos/WikiEditDialog.cpp * + * retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp * * * * Copyright (C) 2012 Robert Fernie * * * @@ -162,7 +162,7 @@ void WikiEditDialog::historySelected() return; } QTreeWidgetItem *item = *(selected.begin()); - + RsGxsGrpMsgIdPair newSnapshot = mThreadMsgIdPair; std::string pageId = item->data(WET_DATA_COLUMN, WET_ROLE_PAGEID).toString().toStdString(); newSnapshot.second = RsGxsMessageId(pageId); @@ -223,14 +223,14 @@ void WikiEditDialog::updateHistoryItem(QTreeWidgetItem *item, bool isLatest) else if ((!mOldHistoryEnabled) && (!isLatest)) { isSelectable = false; - } + } if (isSelectable) { std::cerr << "WikiEditDialog::updateHistoryItem() isSelectable"; std::cerr << std::endl; - item->setFlags(Qt::ItemIsSelectable | + item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled); if (mHistoryMergeMode) @@ -242,7 +242,7 @@ void WikiEditDialog::updateHistoryItem(QTreeWidgetItem *item, bool isLatest) { item->setData(WET_COL_PAGEID, Qt::CheckStateRole, Qt::Unchecked); } - + } else { @@ -719,7 +719,7 @@ void WikiEditDialog::loadBaseHistory(const uint32_t &token) std::cerr << "\tThreadId: " << page.mMeta.mThreadId; std::cerr << " ParentId: " << page.mMeta.mParentId; std::cerr << std::endl; - + GxsIdRSTreeWidgetItem *modItem = new GxsIdRSTreeWidgetItem(mThreadCompareRole, GxsIdDetails::ICON_TYPE_AVATAR); modItem->setData(WET_DATA_COLUMN, WET_ROLE_ORIGPAGEID, QString::fromStdString(page.mMeta.mOrigMsgId.toStdString())); modItem->setData(WET_DATA_COLUMN, WET_ROLE_PAGEID, QString::fromStdString(page.mMeta.mMsgId.toStdString())); @@ -733,7 +733,7 @@ void WikiEditDialog::loadBaseHistory(const uint32_t &token) QString sort; sort = qtime.toString("yyyyMMdd_hhmmss"); text = qtime.toString("dd/MM/yy hh:mm"); - + modItem->setText(WET_COL_DATE, text); modItem->setData(WET_COL_DATE, WET_ROLE_SORT, sort); } @@ -797,7 +797,7 @@ void WikiEditDialog::loadEditTreeData(const uint32_t &token) { QTreeWidgetItem *item = ui.treeWidget_History->topLevelItem(nIndex); - /* index by MsgId --> ONLY For Wiki Thread Head Items... SPECIAL HACK FOR HERE! */ + /* index by MsgId --> ONLY For Wiki Thread Head Items... SPECIAL HACK FOR HERE! */ RsGxsMessageId msgId ( item->data(WET_DATA_COLUMN, WET_ROLE_PAGEID).toString().toStdString() ); items[msgId] = item; } @@ -806,7 +806,7 @@ void WikiEditDialog::loadEditTreeData(const uint32_t &token) for(vit = snapshots.begin(); vit != snapshots.end(); ++vit) { RsWikiSnapshot &snapshot = *vit; - + std::cerr << "Result: PageTitle: " << snapshot.mMeta.mMsgName; std::cerr << " GroupId: " << snapshot.mMeta.mGroupId; std::cerr << std::endl; @@ -846,7 +846,7 @@ void WikiEditDialog::loadEditTreeData(const uint32_t &token) QString sort; sort = qtime.toString("yyyyMMdd_hhmmss"); text = qtime.toString("dd/MM/yy hh:mm"); - + modItem->setText(WET_COL_DATE, text); modItem->setData(WET_COL_DATE, WET_ROLE_SORT, sort); } @@ -895,7 +895,7 @@ void WikiEditDialog::loadRequest(const TokenQueue *queue, const TokenRequest &re { std::cerr << "WikiEditDialog::loadRequest()"; std::cerr << std::endl; - + if (queue == mWikiQueue) { switch(req.mUserType) diff --git a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.h b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.h index 9e21904c0..5b03f56dd 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.h +++ b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/WikiPoos/WikiEditDialog.h * + * retroshare-gui/src/gui/WikiPoos/WikiEditDialog.h * * * * Copyright (C) 2012 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp index 32eeaebae..a9ad4181c 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/connect/ConfCertDialog.cpp * + * retroshare-gui/src/gui/connect/ConfCertDialog.cpp * * * * Copyright (C) 2006 Crypton * * * diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.h b/retroshare-gui/src/gui/connect/ConfCertDialog.h index 4760835da..d694cfa9b 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.h +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/connect/ConfCertDialog.h * + * retroshare-gui/src/gui/connect/ConfCertDialog.h * * * * Copyright (C) 2006 Crypton * * * diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp index efdf4cd15..87219f718 100755 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/connect/ConnectFriendWizard.cpp * + * retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp * * * * Copyright (C) 2009 retroshare team * * Copyright (C) 2009 Oleksiy Bilyanskyy * @@ -84,7 +84,7 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) : error = 0; mTitleFontSize = 0; // Standard mTitleFontWeight = 0; // Standard - + // ui->userFileFrame->hide(); // in homepage dropmenu now // this define comes from Qt example. I don't have mac, so it wasn't tested @@ -109,13 +109,13 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) : /* disable not used pages */ //ui->foffRadioButton->hide(); //ui->rsidRadioButton->hide(); - + ui->info_Label_FrdReq->hide(); ui->info_Label_Request->hide(); - + connect(ui->acceptNoSignGPGCheckBox,SIGNAL(toggled(bool)), ui->_options_GB,SLOT(setEnabled(bool))) ; connect(ui->addKeyToKeyring_CB,SIGNAL(toggled(bool)), ui->acceptNoSignGPGCheckBox,SLOT(setChecked(bool))) ; - + connect(ui->gmailButton, SIGNAL(clicked()), this, SLOT(inviteGmail())); connect(ui->yahooButton, SIGNAL(clicked()), this, SLOT(inviteYahoo())); connect(ui->outlookButton, SIGNAL(clicked()), this, SLOT(inviteOutlook())); @@ -123,13 +123,13 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) : connect(ui->yandexButton, SIGNAL(clicked()), this, SLOT(inviteYandex())); connect(ui->emailButton, SIGNAL(clicked()), this, SLOT(runEmailClient2())); connect(ui->toggleadvancedButton, SIGNAL(clicked()), this, SLOT(toggleAdvanced())); - + subject = tr("RetroShare Invitation"); body = GetStartedDialog::GetInviteText(); - + body += "\n" + GetStartedDialog::GetCutBelowText(); body += "\n\n" + QString::fromUtf8(rsPeers->GetRetroshareInvite().c_str()); - + mIsShortInvite = false; std::string advsetting; @@ -144,7 +144,7 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) : ui->trustLabel->hide(); ui->trustEdit->hide(); } - + //Add warning to direct source checkbox depends general setting. switch (rsFiles->filePermDirectDL()) { @@ -587,7 +587,7 @@ void ConnectFriendWizard::initializePage(int id) } fillGroups(this, ui->groupComboBox, groupId); - + if(peerDetails.isHiddenNode) { ui->_addIPToWhiteList_CB_2->setEnabled(false) ; @@ -752,7 +752,7 @@ void ConnectFriendWizard::accept() // first, set data related to profile key. - if(accept_connection && !peerDetails.gpg_id.isNull()) + if(accept_connection && !peerDetails.gpg_id.isNull()) { std::cerr << "ConclusionPage::validatePage() accepting GPG key for connection." << std::endl; @@ -847,7 +847,7 @@ void ConnectFriendWizard::accept() } } - + if (runProgressDialog) { RsPeerId ssl_id = peerDetails.id; @@ -914,7 +914,7 @@ void ConnectFriendWizard::cleanFriendCert() RetroshareInviteFlags dummy_flags = RetroshareInviteFlags::ALL; certDetail = ConfCertDialog::getCertificateDescription(details,false,mIsShortInvite,dummy_flags); } - + if (mIsShortInvite) errorMsg = tr("Valid Retroshare ID") + (mIsShortInvite?" (Short format)":" (plain format with profile key)"); else diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.h b/retroshare-gui/src/gui/connect/ConnectFriendWizard.h index f740da676..7173de353 100755 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.h +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/connect/ConnectFriendWizard.h * + * retroshare-gui/src/gui/connect/ConnectFriendWizard.h * * * * Copyright (C) 2018 retroshare team * * * diff --git a/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp b/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp index e405430e5..d7e81e5ee 100755 --- a/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/connect/ConnectProgressDialog.cpp * + * retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp * * * * Copyright 2012-2013 by Robert Fernie * * * diff --git a/retroshare-gui/src/gui/connect/ConnectProgressDialog.h b/retroshare-gui/src/gui/connect/ConnectProgressDialog.h index cd05b0135..534ac3f3d 100644 --- a/retroshare-gui/src/gui/connect/ConnectProgressDialog.h +++ b/retroshare-gui/src/gui/connect/ConnectProgressDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/connect/ConnectProgressDialog.h * + * retroshare-gui/src/gui/connect/ConnectProgressDialog.h * * * * Copyright 2012-2013 by Robert Fernie * * * diff --git a/retroshare-gui/src/gui/connect/FriendRecommendDialog.cpp b/retroshare-gui/src/gui/connect/FriendRecommendDialog.cpp index 7507f2b2b..9b8342dcc 100644 --- a/retroshare-gui/src/gui/connect/FriendRecommendDialog.cpp +++ b/retroshare-gui/src/gui/connect/FriendRecommendDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/connect/FriendRecommendDialog.cpp * + * retroshare-gui/src/gui/connect/FriendRecommendDialog.cpp * * * * Copyright 2018 by Retroshare Team * * * diff --git a/retroshare-gui/src/gui/connect/FriendRecommendDialog.h b/retroshare-gui/src/gui/connect/FriendRecommendDialog.h index 6ffafd343..026339c5e 100644 --- a/retroshare-gui/src/gui/connect/FriendRecommendDialog.h +++ b/retroshare-gui/src/gui/connect/FriendRecommendDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/connect/FriendRecommendDialog.h * + * retroshare-gui/src/gui/connect/FriendRecommendDialog.h * * * * Copyright 2018 by Retroshare Team * * * diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp index ce410f47e..8191dac6b 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/connect/PGPKeyDialog.cpp * + * retroshare-gui/src/gui/connect/PGPKeyDialog.cpp * * * * Copyright 2006 by Crypton * * * diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.h b/retroshare-gui/src/gui/connect/PGPKeyDialog.h index 8ca79f2bf..b251e0002 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.h +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/connect/PGPKeyDialog.h * + * retroshare-gui/src/gui/connect/PGPKeyDialog.h * * * * Copyright 2006 by Crypton * * * diff --git a/retroshare-gui/src/gui/elastic/arrow.cpp b/retroshare-gui/src/gui/elastic/arrow.cpp index 22c706ed8..e4e2e1598 100644 --- a/retroshare-gui/src/gui/elastic/arrow.cpp +++ b/retroshare-gui/src/gui/elastic/arrow.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/elastic/arrow.cpp * + * retroshare-gui/src/gui/elastic/arrow.cpp * * * * Copyright (c) 2012, RetroShare Team * * * @@ -117,7 +117,7 @@ void Arrow::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget * QPointF sourceArrowP1 = sourcePoint + QPointF(sin(angle + Pi / 3) * arrowSize, cos(angle + Pi / 3) * arrowSize); QPointF sourceArrowP2 = sourcePoint + QPointF(sin(angle + Pi - Pi / 3) * arrowSize, - cos(angle + Pi - Pi / 3) * arrowSize); + cos(angle + Pi - Pi / 3) * arrowSize); QPointF destArrowP1 = destPoint + QPointF(sin(angle - Pi / 3) * arrowSize, cos(angle - Pi / 3) * arrowSize); QPointF destArrowP2 = destPoint + QPointF(sin(angle - Pi + Pi / 3) * arrowSize, @@ -128,5 +128,5 @@ void Arrow::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget * painter->setBrush(Qt::black); } painter->drawPolygon(QPolygonF() << line.p1() << sourceArrowP1 << sourceArrowP2); - painter->drawPolygon(QPolygonF() << line.p2() << destArrowP1 << destArrowP2); + painter->drawPolygon(QPolygonF() << line.p2() << destArrowP1 << destArrowP2); } diff --git a/retroshare-gui/src/gui/elastic/arrow.h b/retroshare-gui/src/gui/elastic/arrow.h index a3ab003f1..829ea3a70 100644 --- a/retroshare-gui/src/gui/elastic/arrow.h +++ b/retroshare-gui/src/gui/elastic/arrow.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/elastic/arrow.h * + * retroshare-gui/src/gui/elastic/arrow.h * * * * Copyright (c) 2012, RetroShare Team * * * @@ -43,11 +43,11 @@ public: enum { Type = UserType + 3 }; int type() const { return Type; } - + protected: QRectF boundingRect() const; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - + private: Node *source, *dest; diff --git a/retroshare-gui/src/gui/elastic/edge.cpp b/retroshare-gui/src/gui/elastic/edge.cpp index 820d7c79a..136e3740b 100644 --- a/retroshare-gui/src/gui/elastic/edge.cpp +++ b/retroshare-gui/src/gui/elastic/edge.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/elastic/edge.cpp * + * retroshare-gui/src/gui/elastic/edge.cpp * * * * Copyright (c) 2012, RetroShare Team * * * @@ -146,7 +146,7 @@ void Edge::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) float sin_theta_mins_2_pi_over_3 = sin_theta_plus_2_pi_over_3 - 2 * cos_theta * sin_2_pi_over_3 ; QPointF sourceArrowP1 = sourcePoint + QPointF( sin_theta_plus_pi_over_3 * arrowSize, cos_theta_plus_pi_over_3 * arrowSize); - QPointF sourceArrowP2 = sourcePoint + QPointF(sin_theta_plus_2_pi_over_3 * arrowSize, cos_theta_plus_2_pi_over_3 * arrowSize); + QPointF sourceArrowP2 = sourcePoint + QPointF(sin_theta_plus_2_pi_over_3 * arrowSize, cos_theta_plus_2_pi_over_3 * arrowSize); QPointF destArrowP1 = destPoint + QPointF( sin_theta_mins_pi_over_3 * arrowSize, cos_theta_mins_pi_over_3 * arrowSize); QPointF destArrowP2 = destPoint + QPointF(sin_theta_mins_2_pi_over_3 * arrowSize, cos_theta_mins_2_pi_over_3 * arrowSize); @@ -157,6 +157,6 @@ void Edge::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) painter->setBrush(Qt::black); } painter->drawConvexPolygon(QPolygonF() << line.p1() << sourceArrowP1 << sourceArrowP2); - painter->drawConvexPolygon(QPolygonF() << line.p2() << destArrowP1 << destArrowP2); + painter->drawConvexPolygon(QPolygonF() << line.p2() << destArrowP1 << destArrowP2); } diff --git a/retroshare-gui/src/gui/elastic/elnode.cpp b/retroshare-gui/src/gui/elastic/elnode.cpp index 326c469fa..88c7b103c 100644 --- a/retroshare-gui/src/gui/elastic/elnode.cpp +++ b/retroshare-gui/src/gui/elastic/elnode.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/elastic/elnode.cpp * + * retroshare-gui/src/gui/elastic/elnode.cpp * * * * Copyright (c) 2012, RetroShare Team * * * diff --git a/retroshare-gui/src/gui/elastic/elnode.h b/retroshare-gui/src/gui/elastic/elnode.h index 33043ddab..1431bbae6 100644 --- a/retroshare-gui/src/gui/elastic/elnode.h +++ b/retroshare-gui/src/gui/elastic/elnode.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/elastic/elnode.h * + * retroshare-gui/src/gui/elastic/elnode.h * * * * Copyright (c) 2012, RetroShare Team * * * diff --git a/retroshare-gui/src/gui/elastic/fft.h b/retroshare-gui/src/gui/elastic/fft.h index c26dd61db..19bb9b1cd 100644 --- a/retroshare-gui/src/gui/elastic/fft.h +++ b/retroshare-gui/src/gui/elastic/fft.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/elastic/fft.h * + * retroshare-gui/src/gui/elastic/fft.h * * * * Copyright 1996-2001 Takuya OOURA * * * @@ -43,12 +43,12 @@ function prototypes -------- Complex DFT (Discrete Fourier Transform) -------- [definition] - X[k1][k2] = sum_j1=0^n1-1 sum_j2=0^n2-1 x[j1][j2] * - exp(2*pi*i*j1*k1/n1) * + X[k1][k2] = sum_j1=0^n1-1 sum_j2=0^n2-1 x[j1][j2] * + exp(2*pi*i*j1*k1/n1) * exp(2*pi*i*j2*k2/n2), 0<=k1 - X[k1][k2] = sum_j1=0^n1-1 sum_j2=0^n2-1 x[j1][j2] * - exp(-2*pi*i*j1*k1/n1) * + X[k1][k2] = sum_j1=0^n1-1 sum_j2=0^n2-1 x[j1][j2] * + exp(-2*pi*i*j1*k1/n1) * exp(-2*pi*i*j2*k2/n2), 0<=k1= max(n1/2, n2/2) w[],ip[] are initialized if ip[0] == 0. [remark] - Inverse of + Inverse of cdft2d(n1, 2*n2, -1, a, ip, w); - is + is cdft2d(n1, 2*n2, 1, a, ip, w); for (j1 = 0; j1 <= n1 - 1; j1++) { for (j2 = 0; j2 <= 2 * n2 - 1; j2++) { diff --git a/retroshare-gui/src/gui/elastic/graphwidget.cpp b/retroshare-gui/src/gui/elastic/graphwidget.cpp index deb4dff2d..fc3d990d1 100644 --- a/retroshare-gui/src/gui/elastic/graphwidget.cpp +++ b/retroshare-gui/src/gui/elastic/graphwidget.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/elastic/graphwidget.cpp * + * retroshare-gui/src/gui/elastic/graphwidget.cpp * * * * Copyright (c) 2012, RetroShare Team * * * @@ -52,7 +52,7 @@ void GraphWidget::clearGraph() { scene()->clear(); scene()->setSceneRect(0, 0, width(), height()); - + _edges.clear(); _nodes.clear(); _friction_factor = 1.0f ; @@ -271,7 +271,7 @@ void GraphWidget::timerEvent(QTimerEvent *event) } bool itemsMoved = false; - foreach (Node *node, _nodes) + foreach (Node *node, _nodes) if(node->progress()) itemsMoved = true; @@ -304,7 +304,7 @@ void GraphWidget::setEdgeLength(uint32_t l) void GraphWidget::setNameSearch(QString s) { float f = QFontMetrics(font()).height()/16.0 ; - + if (s.length() == 0){ for(uint32_t i=0;i<_nodes.size();++i) _nodes[i]->setNodeDrawSize(12 * f); diff --git a/retroshare-gui/src/gui/elastic/graphwidget.h b/retroshare-gui/src/gui/elastic/graphwidget.h index a4a975455..3183717b1 100644 --- a/retroshare-gui/src/gui/elastic/graphwidget.h +++ b/retroshare-gui/src/gui/elastic/graphwidget.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/elastic/graphwidget.h * + * retroshare-gui/src/gui/elastic/graphwidget.h * * * * Copyright (c) 2012, RetroShare Team * * * diff --git a/retroshare-gui/src/gui/feeds/AttachFileItem.cpp b/retroshare-gui/src/gui/feeds/AttachFileItem.cpp index af150edc3..88ce97c06 100644 --- a/retroshare-gui/src/gui/feeds/AttachFileItem.cpp +++ b/retroshare-gui/src/gui/feeds/AttachFileItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/AttachFileItem.cpp * + * retroshare-gui/src/gui/feeds/AttachFileItem.cpp * * * * Copyright (c) 2008, Robert Fernie * * * @@ -42,7 +42,7 @@ * a) Addition to General Dialog (1), (2), (3) * (i) (1), request Hash -> (3). * (ii) (2), download complete -> (3) - * (iii) (3) + * (iii) (3) * * b) Message/Blog/Channel (2), (3) * (i) (2), download complete -> (3) @@ -80,7 +80,7 @@ AttachFileItem::AttachFileItem(const RsFileHash& hash, const QString& name, uint /* all other states are possible */ - if (!rsFiles) + if (!rsFiles) { mMode = AFI_STATE_ERROR; } @@ -111,7 +111,7 @@ void AttachFileItem::Setup() { connect( cancelButton, SIGNAL( clicked( void ) ), this, SLOT( cancel ( void ) ) ); - /* once off check - if remote, check if we have it + /* once off check - if remote, check if we have it * NB: This check might be expensive - and it'll happen often! */ #ifdef DEBUG_ITEM @@ -176,7 +176,7 @@ void AttachFileItem::updateItemStatic() progressBar->setFormat("%v kB"); mDivisor = 1000; } - else + else { progressBar->setRange(0, mFileSize); progressBar->setFormat("%v B"); @@ -224,7 +224,7 @@ void AttachFileItem::updateItemStatic() progressBar->setFormat("ERROR"); cancelButton->setEnabled(false); - + progressBar->setValue(0); filename = tr("[ERROR])") + " " + filename; @@ -474,7 +474,7 @@ void AttachFileItem::updateItem() msec_rate = 2000; /* should be download rate dependent */ break; } - + if (repeat) { #ifdef DEBUG_ITEM diff --git a/retroshare-gui/src/gui/feeds/AttachFileItem.h b/retroshare-gui/src/gui/feeds/AttachFileItem.h index afe32e0e1..3bb63e483 100644 --- a/retroshare-gui/src/gui/feeds/AttachFileItem.h +++ b/retroshare-gui/src/gui/feeds/AttachFileItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/AttachFileItem.h * + * retroshare-gui/src/gui/feeds/AttachFileItem.h * * * * Copyright (c) 2008, Robert Fernie * * * diff --git a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp index 59082a8fd..5ae2ffad9 100644 --- a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp +++ b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * retroshare-gui/src/gui/Posted/BoardsCommentsItem.cpp * + * retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp * * * * Copyright (C) 2020 by RetroShare Team * * * @@ -298,7 +298,7 @@ void BaseBoardsCommentsItem::readToggled(bool checked) RsThread::async( [this,checked]() { RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId()); - + rsPosted->setCommentReadStatus(msgPair, !checked); }); } @@ -445,7 +445,7 @@ void BoardsCommentsItem::setComment(const RsGxsComment& cmt) if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) pixmap = GxsIdDetails::makeDefaultIcon(cmt.mMeta.mAuthorId,GxsIdDetails::LARGE); ui->avatarLabel->setPixmap(pixmap); - + emit sizeChanged(this); } @@ -516,7 +516,7 @@ void BoardsCommentsItem::fill() ui->clearButton->show(); ui->readAndClearButton->show(); } - + // hide read button not yet functional ui->readButton->hide(); diff --git a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.h b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.h index bffbf5bf6..1cd2705dc 100644 --- a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.h +++ b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * retroshare-gui/src/gui/Posted/BoardsCommentsItem.h * + * retroshare-gui/src/gui/feeds/BoardsCommentsItem.h * * * * Copyright (C) 2020 by RetroShare Team * * * diff --git a/retroshare-gui/src/gui/feeds/BoardsPostItem.cpp b/retroshare-gui/src/gui/feeds/BoardsPostItem.cpp index 9fcf15bff..f1ce23f99 100644 --- a/retroshare-gui/src/gui/feeds/BoardsPostItem.cpp +++ b/retroshare-gui/src/gui/feeds/BoardsPostItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/BoardsPostItem.cpp * + * retroshare-gui/src/gui/feeds/BoardsPostItem.cpp * * * * Copyright (c) 2012, Robert Fernie * * * @@ -374,7 +374,7 @@ void BoardsPostItem::fill() if (IS_MSG_NEW(mPost.mMeta.mMsgStatus)) mCloseOnRead = true; - + // differences between Feed or Top of Comment. if(mFeedHolder) { diff --git a/retroshare-gui/src/gui/feeds/BoardsPostItem.h b/retroshare-gui/src/gui/feeds/BoardsPostItem.h index 3b8845f63..18f4d2be2 100644 --- a/retroshare-gui/src/gui/feeds/BoardsPostItem.h +++ b/retroshare-gui/src/gui/feeds/BoardsPostItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/BoardsPostItem.h * + * retroshare-gui/src/gui/feeds/BoardsPostItem.h * * * * Copyright (c) 2012, Robert Fernie * * * @@ -81,7 +81,7 @@ private slots: void viewPicture(); signals: - void vote(const RsGxsGrpMsgIdPair& msgId, bool up); + void vote(const RsGxsGrpMsgIdPair& msgId, bool up); private: void setup(); diff --git a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h index 87192c7d0..cea168bfd 100644 --- a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h +++ b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/ChannelsCommentsItem.h * + * retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h * * * * Copyright (c) 2020, Retroshare Team * * * @@ -93,7 +93,7 @@ private slots: void makeDownVote(); signals: - void vote(const RsGxsGrpMsgIdPair& msgId, bool up); + void vote(const RsGxsGrpMsgIdPair& msgId, bool up); private: void setup(); diff --git a/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp b/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp index fdbd678d8..908132e64 100644 --- a/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/ChatMsgItem.cpp * + * retroshare-gui/src/gui/feeds/ChatMsgItem.cpp * * * * Copyright (c) 2008, Robert Fernie * * * @@ -49,7 +49,7 @@ ChatMsgItem::ChatMsgItem(FeedHolder *parent, uint32_t feedId, const RsPeerId &pe { /* Invoke the Qt Designer generated object setup routine */ setupUi(this); - + messageFrame->setVisible(false); sendButton->hide(); cancelButton->hide(); @@ -78,7 +78,7 @@ ChatMsgItem::ChatMsgItem(FeedHolder *parent, uint32_t feedId, const RsPeerId &pe RsQThreadUtils::postToObject([=]() { auto fe = dynamic_cast(e.get()); - + if(!fe || fe->mSslId != mPeerId) return; @@ -244,11 +244,11 @@ void ChatMsgItem::sendMessage() { /* construct a message */ MessageInfo mi; - + mi.title = tr("Quick Message").toUtf8().constData(); mi.msg = quickmsgText->toHtml().toUtf8().constData(); mi.destinations.insert(MsgAddress(mPeerId,MsgAddress::MSG_ADDRESS_MODE_TO)); - + rsMail->MessageSend(mi); quickmsgText->clear(); diff --git a/retroshare-gui/src/gui/feeds/ChatMsgItem.h b/retroshare-gui/src/gui/feeds/ChatMsgItem.h index 0515b925e..0d6b2a109 100644 --- a/retroshare-gui/src/gui/feeds/ChatMsgItem.h +++ b/retroshare-gui/src/gui/feeds/ChatMsgItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/ChatMsgItem.h * + * retroshare-gui/src/gui/feeds/ChatMsgItem.h * * * * Copyright (c) 2008, Robert Fernie * * * diff --git a/retroshare-gui/src/gui/feeds/FeedHolder.cpp b/retroshare-gui/src/gui/feeds/FeedHolder.cpp index 871fa5acc..12e3d5f2b 100644 --- a/retroshare-gui/src/gui/feeds/FeedHolder.cpp +++ b/retroshare-gui/src/gui/feeds/FeedHolder.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/FeedHolder.cpp * + * retroshare-gui/src/gui/feeds/FeedHolder.cpp * * * * Copyright (c) 2008, Robert Fernie * * * diff --git a/retroshare-gui/src/gui/feeds/FeedHolder.h b/retroshare-gui/src/gui/feeds/FeedHolder.h index 6c2f256e0..1da180c13 100644 --- a/retroshare-gui/src/gui/feeds/FeedHolder.h +++ b/retroshare-gui/src/gui/feeds/FeedHolder.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/FeedHolder.h * + * retroshare-gui/src/gui/feeds/FeedHolder.h * * * * Copyright (c) 2008, Robert Fernie * * * diff --git a/retroshare-gui/src/gui/feeds/FeedItem.cpp b/retroshare-gui/src/gui/feeds/FeedItem.cpp index df8c82c5d..b22f5aa9a 100644 --- a/retroshare-gui/src/gui/feeds/FeedItem.cpp +++ b/retroshare-gui/src/gui/feeds/FeedItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/FeedItem.cpp * + * retroshare-gui/src/gui/feeds/FeedItem.cpp * * * * Copyright (c) 2014, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/feeds/FeedItem.h b/retroshare-gui/src/gui/feeds/FeedItem.h index f11424520..0efd06642 100644 --- a/retroshare-gui/src/gui/feeds/FeedItem.h +++ b/retroshare-gui/src/gui/feeds/FeedItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/FeedItem.h * + * retroshare-gui/src/gui/feeds/FeedItem.h * * * * Copyright (c) 2014, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp index dd7e46f9a..42f7c0bc2 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/GxsChannelGroupItem.cpp * + * retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp * * * * Copyright (c) 2008, Robert Fernie * * * diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h index ab9aaf088..5ddef4711 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h +++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/GxsChannelGroupItem.h * + * retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h * * * * Copyright (c) 2008, Robert Fernie * * * @@ -27,7 +27,7 @@ namespace Ui { class GxsChannelGroupItem; } - + class FeedHolder; class GxsChannelGroupItem : public GxsGroupFeedItem diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp index 9d6a9992f..e782caa9e 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/GxsChannelPostItem.cpp * + * retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp * * * * Copyright (c) 2012, Robert Fernie * * * @@ -352,7 +352,7 @@ void GxsChannelPostItem::fill() { ui->unsubscribeButton->setEnabled(true); } - else + else { ui->unsubscribeButton->setEnabled(false); } @@ -377,7 +377,7 @@ void GxsChannelPostItem::fill() ui->subjectLabel->setText(RsStringUtil::CopyLines(QString::fromUtf8(mPost.mMsg.c_str()), 2)) ; //QString score = QString::number(post.mTopScore); - // scoreLabel->setText(score); + // scoreLabel->setText(score); /* disable buttons: deletion facility not enabled with cache services yet */ ui->clearButton->setEnabled(false); @@ -392,8 +392,8 @@ void GxsChannelPostItem::fill() ui->readButton->setVisible(true); setReadStatus(IS_MSG_NEW(mPost.mMeta.mMsgStatus), IS_MSG_UNREAD(mPost.mMeta.mMsgStatus) || IS_MSG_NEW(mPost.mMeta.mMsgStatus)); - } - else + } + else { ui->readButton->setVisible(false); ui->newLabel->setVisible(false); @@ -401,7 +401,7 @@ void GxsChannelPostItem::fill() mCloseOnRead = false; } - + // differences between Feed or Top of Comment. if (mFeedHolder) { @@ -417,7 +417,7 @@ void GxsChannelPostItem::fill() { ui->commentButton->hide(); } - + // disable voting buttons - if they have already voted. /*if (post.mMeta.mMsgStatus & GXS_SERV::GXS_MSG_STATUS_VOTE_MASK) { @@ -461,10 +461,10 @@ void GxsChannelPostItem::fill() std::string path; SubFileItem *fi = new SubFileItem(it->mHash, it->mName, path, it->mSize, SFI_STATE_REMOTE | SFI_TYPE_CHANNEL, RsPeerId()); mFileItems.push_back(fi); - + /* check if the file is a media file */ if (!misc::isPreviewable(QFileInfo(QString::fromUtf8(it->mName.c_str())).suffix())) - { + { fi->mediatype(); /* check if the file is not a media file and change text */ ui->playButton->setText(tr("Open")); diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.h b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.h index 4c4503ec0..710121ed4 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.h +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/GxsChannelPostItem.h * + * retroshare-gui/src/gui/feeds/GxsChannelPostItem.h * * * * Copyright (c) 2012, Robert Fernie * * * @@ -100,7 +100,7 @@ private slots: void updateItem(); signals: - void vote(const RsGxsGrpMsgIdPair& msgId, bool up); + void vote(const RsGxsGrpMsgIdPair& msgId, bool up); private: void setup(); diff --git a/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp b/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp index 99825a078..4cede8649 100644 --- a/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/GxsCircleItem.cpp * + * retroshare-gui/src/gui/feeds/GxsCircleItem.cpp * * * * Copyright (c) 2014, Retroshare Team * * * @@ -70,7 +70,7 @@ void GxsCircleItem::setup() idName = QString::fromUtf8(idDetails.mNickname.c_str()) + " (ID=" + QString::fromStdString(mGxsId.toStdString()) + ")" ; else idName = QString::fromStdString(mGxsId.toStdString()) ; - + QPixmap pixmap ; if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) pixmap = GxsIdDetails::makeDefaultIcon(mGxsId,GxsIdDetails::SMALL); diff --git a/retroshare-gui/src/gui/feeds/GxsCircleItem.h b/retroshare-gui/src/gui/feeds/GxsCircleItem.h index 8133b8fa7..09f0b397f 100644 --- a/retroshare-gui/src/gui/feeds/GxsCircleItem.h +++ b/retroshare-gui/src/gui/feeds/GxsCircleItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/GxsCircleItem.h * + * retroshare-gui/src/gui/feeds/GxsCircleItem.h * * * * Copyright (c) 2014, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/feeds/GxsFeedItem.cpp b/retroshare-gui/src/gui/feeds/GxsFeedItem.cpp index 524ecc578..b2c10abf6 100644 --- a/retroshare-gui/src/gui/feeds/GxsFeedItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsFeedItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * retroshare-gui/src/gui/gxs/GxsFeedItem.cpp * + * retroshare-gui/src/retroshare-gui/src/gui/gxs/GxsFeedItem.cpp * * * * Copyright 2012-2013 by Robert Fernie * * * diff --git a/retroshare-gui/src/gui/feeds/GxsFeedItem.h b/retroshare-gui/src/gui/feeds/GxsFeedItem.h index b33db7f18..bc33cf11f 100644 --- a/retroshare-gui/src/gui/feeds/GxsFeedItem.h +++ b/retroshare-gui/src/gui/feeds/GxsFeedItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * retroshare-gui/src/gui/feeds/GxsFeedItem.h * + * retroshare-gui/src/retroshare-gui/src/gui/feeds/GxsFeedItem.h * * * * Copyright 2012-2013 by Robert Fernie * * * diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp index 3c71544d4..7dce0c5a6 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/GxsForumGroupItem.cpp * + * retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp * * * * Copyright (c) 2014, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h index 31026f18c..1eff209d8 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h +++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/GxsForumGroupItem.h * + * retroshare-gui/src/gui/feeds/GxsForumGroupItem.h * * * * Copyright (c) 2014, Retroshare Team * * * @@ -28,7 +28,7 @@ namespace Ui { class GxsForumGroupItem; } - + class FeedHolder; class GxsForumGroupItem : public GxsGroupFeedItem diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp index 333a6a577..8f7099f05 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/GxsForumMsgItem.cpp * + * retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp * * * * Copyright (c) 2014, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h index 2c8e55292..414656843 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h +++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/GxsForumMsgItem.h * + * retroshare-gui/src/gui/feeds/GxsForumMsgItem.h * * * * Copyright (c) 2014, Retroshare Team * * * @@ -66,7 +66,7 @@ private slots: void on_linkActivated(QString link); signals: - void vote(const RsGxsGrpMsgIdPair& msgId, bool up); + void vote(const RsGxsGrpMsgIdPair& msgId, bool up); private: void setup(); diff --git a/retroshare-gui/src/gui/feeds/GxsGroupFeedItem.cpp b/retroshare-gui/src/gui/feeds/GxsGroupFeedItem.cpp index 523f41076..7abea60ce 100644 --- a/retroshare-gui/src/gui/feeds/GxsGroupFeedItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsGroupFeedItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * retroshare-gui/src/gui/feeds/GxsGroupFeedItem.cpp * + * retroshare-gui/src/retroshare-gui/src/gui/feeds/GxsGroupFeedItem.cpp * * * * Copyright 2012-2013 by Robert Fernie * * * diff --git a/retroshare-gui/src/gui/feeds/GxsGroupFeedItem.h b/retroshare-gui/src/gui/feeds/GxsGroupFeedItem.h index c70879bbd..c0af7a1fa 100644 --- a/retroshare-gui/src/gui/feeds/GxsGroupFeedItem.h +++ b/retroshare-gui/src/gui/feeds/GxsGroupFeedItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * retroshare-gui/src/gui/feeds/GxsGroupFeedItem.h * + * retroshare-gui/src/retroshare-gui/src/gui/feeds/GxsGroupFeedItem.h * * * * Copyright 2012-2013 by Robert Fernie * * * diff --git a/retroshare-gui/src/gui/feeds/MsgItem.cpp b/retroshare-gui/src/gui/feeds/MsgItem.cpp index f1e7a8a69..9d957c1d4 100644 --- a/retroshare-gui/src/gui/feeds/MsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/MsgItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/MsgItem.cpp * + * retroshare-gui/src/gui/feeds/MsgItem.cpp * * * * Copyright (c) 2008, Robert Fernie * * * @@ -136,7 +136,7 @@ void MsgItem::updateItemStatic() MessageInfo mi; - if (!rsMail) + if (!rsMail) return; if (!rsMail->getMessage(mMsgId, mi)) @@ -244,7 +244,7 @@ void MsgItem::updateItemStatic() } playButton->setEnabled(false); - + if (mIsHome) { /* disable buttons */ @@ -362,7 +362,7 @@ void MsgItem::replyMsg() if (mFeedHolder) { //mParent->openMsg(FEEDHOLDER_MSG_MESSAGE, mPeerId, mMsgId); - + MessageComposer *nMsgDialog = MessageComposer::replyMsg(mMsgId, false); if (nMsgDialog == NULL) { return; @@ -392,7 +392,7 @@ void MsgItem::sendInvite() { MessageInfo mi; - if (!rsMail) + if (!rsMail) return; if (!rsMail->getMessage(mMsgId, mi)) diff --git a/retroshare-gui/src/gui/feeds/MsgItem.h b/retroshare-gui/src/gui/feeds/MsgItem.h index 2cb8645ba..df1d3b33f 100644 --- a/retroshare-gui/src/gui/feeds/MsgItem.h +++ b/retroshare-gui/src/gui/feeds/MsgItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/MsgItem.h * + * retroshare-gui/src/gui/feeds/MsgItem.h * * * * Copyright (c) 2008, Robert Fernie * * * diff --git a/retroshare-gui/src/gui/feeds/NewsFeedUserNotify.cpp b/retroshare-gui/src/gui/feeds/NewsFeedUserNotify.cpp index 2b296f993..639ff99ca 100644 --- a/retroshare-gui/src/gui/feeds/NewsFeedUserNotify.cpp +++ b/retroshare-gui/src/gui/feeds/NewsFeedUserNotify.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/NewsFeedUserNotify.cpp * + * retroshare-gui/src/gui/feeds/NewsFeedUserNotify.cpp * * * * Copyright (c) 2012, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/feeds/NewsFeedUserNotify.h b/retroshare-gui/src/gui/feeds/NewsFeedUserNotify.h index b7d82565a..1f157146a 100644 --- a/retroshare-gui/src/gui/feeds/NewsFeedUserNotify.h +++ b/retroshare-gui/src/gui/feeds/NewsFeedUserNotify.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/NewsFeedUserNotify.h * + * retroshare-gui/src/gui/feeds/NewsFeedUserNotify.h * * * * Copyright (c) 2012, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/feeds/PeerItem.cpp b/retroshare-gui/src/gui/feeds/PeerItem.cpp index 3dc7c4901..e9f897d93 100644 --- a/retroshare-gui/src/gui/feeds/PeerItem.cpp +++ b/retroshare-gui/src/gui/feeds/PeerItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/PeerItem.cpp * + * retroshare-gui/src/gui/feeds/PeerItem.cpp * * * * Copyright (c) 2008, Robert Fernie * * * @@ -46,7 +46,7 @@ PeerItem::PeerItem(FeedHolder *parent, uint32_t feedId, const RsPeerId &peerId, { /* Invoke the Qt Designer generated object setup routine */ setupUi(this); - + sendmsgButton->setEnabled(false); /* general ones */ diff --git a/retroshare-gui/src/gui/feeds/PeerItem.h b/retroshare-gui/src/gui/feeds/PeerItem.h index 8a7a2abc3..18f3fffed 100644 --- a/retroshare-gui/src/gui/feeds/PeerItem.h +++ b/retroshare-gui/src/gui/feeds/PeerItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/PeerItem.h * + * retroshare-gui/src/gui/feeds/PeerItem.h * * * * Copyright (c) 2008, Robert Fernie * * * @@ -60,7 +60,7 @@ private slots: void openChat(); void updateItem(); - + private: diff --git a/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp b/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp index eb564f993..0bd10dc92 100644 --- a/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp +++ b/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/PostedGroupItem.cpp * + * retroshare-gui/src/gui/feeds/PostedGroupItem.cpp * * * * Copyright (c) 2014, Retroshare Team * * * @@ -174,7 +174,7 @@ void PostedGroupItem::fill() // ui->nameLabel->setText(groupName()); ui->descLabel->setText(QString::fromUtf8(mGroup.mDescription.c_str())); - + ui->logoLabel->setEnableZoom(false); int desired_height = QFontMetricsF(font()).height() * ITEM_HEIGHT_FACTOR; ui->logoLabel->setFixedSize(ITEM_PICTURE_FORMAT_RATIO*desired_height,desired_height); diff --git a/retroshare-gui/src/gui/feeds/PostedGroupItem.h b/retroshare-gui/src/gui/feeds/PostedGroupItem.h index fdda04922..d52301fc3 100644 --- a/retroshare-gui/src/gui/feeds/PostedGroupItem.h +++ b/retroshare-gui/src/gui/feeds/PostedGroupItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/PostedGroupItem.h * + * retroshare-gui/src/gui/feeds/PostedGroupItem.h * * * * Copyright (c) 2014, Retroshare Team * * * @@ -27,7 +27,7 @@ namespace Ui { class PostedGroupItem; } - + class FeedHolder; class PostedGroupItem : public GxsGroupFeedItem diff --git a/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp b/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp index 6d1a3e809..f1cffb75a 100644 --- a/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp +++ b/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/SecurityIpItem.cpp * + * retroshare-gui/src/gui/feeds/SecurityIpItem.cpp * * * * Copyright (c) 2015, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/feeds/SecurityIpItem.h b/retroshare-gui/src/gui/feeds/SecurityIpItem.h index ffaac8915..ebeb04126 100644 --- a/retroshare-gui/src/gui/feeds/SecurityIpItem.h +++ b/retroshare-gui/src/gui/feeds/SecurityIpItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/SecurityIpItem.h * + * retroshare-gui/src/gui/feeds/SecurityIpItem.h * * * * Copyright (c) 2015, Retroshare Team * * * @@ -29,7 +29,7 @@ namespace Ui { class SecurityIpItem; -} +} class FeedHolder; diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.cpp b/retroshare-gui/src/gui/feeds/SecurityItem.cpp index 4d21440a4..8f37b21c0 100644 --- a/retroshare-gui/src/gui/feeds/SecurityItem.cpp +++ b/retroshare-gui/src/gui/feeds/SecurityItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/SecurityItem.cpp * + * retroshare-gui/src/gui/feeds/SecurityItem.cpp * * * * Copyright (c) 2008, Robert Fernie * * * @@ -228,7 +228,7 @@ void SecurityItem::updateItem() removeFriendButton->setEnabled(false); removeFriendButton->hide(); peerDetailsButton->setEnabled(false); - + if(mType == RsFeedTypeFlags::RS_FEED_ITEM_SEC_BAD_CERTIFICATE) { peerNameLabel->setText(tr("SSL request")); @@ -236,7 +236,7 @@ void SecurityItem::updateItem() requestLabel->hide(); peerDetailsButton->hide(); } - else + else { peerNameLabel->setText(tr("An unknown peer")); friendRequesttoolButton->show(); @@ -276,7 +276,7 @@ void SecurityItem::updateItem() /* do buttons */ peerDetailsButton->setEnabled(true); - + if (details.state & RS_PEER_STATE_CONNECTED) { chatButton->show(); diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.h b/retroshare-gui/src/gui/feeds/SecurityItem.h index e2ba2b394..51afbb349 100644 --- a/retroshare-gui/src/gui/feeds/SecurityItem.h +++ b/retroshare-gui/src/gui/feeds/SecurityItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/SecurityItem.h * + * retroshare-gui/src/gui/feeds/SecurityItem.h * * * * Copyright (c) 2008, Robert Fernie * * * diff --git a/retroshare-gui/src/gui/feeds/SubFileItem.cpp b/retroshare-gui/src/gui/feeds/SubFileItem.cpp index 251190e62..e0c14dbd2 100644 --- a/retroshare-gui/src/gui/feeds/SubFileItem.cpp +++ b/retroshare-gui/src/gui/feeds/SubFileItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/SubFileItem.cpp * + * retroshare-gui/src/gui/feeds/SubFileItem.cpp * * * * Copyright (c) 2008, Robert Fernie * * * @@ -50,7 +50,7 @@ * a) Addition to General Dialog (1), (2), (3) * (i) (1), request Hash -> (3). * (ii) (2), download complete -> (3) - * (iii) (3) + * (iii) (3) * * b) Message/Blog/Channel (2), (3) * (i) (2), download complete -> (3) @@ -85,7 +85,7 @@ SubFileItem::SubFileItem(const RsFileHash &hash, const std::string &name, const /* all other states are possible */ - if (!rsFiles) + if (!rsFiles) { mMode = SFI_STATE_ERROR; } @@ -103,7 +103,7 @@ void SubFileItem::Setup() connect( copyLinkButton, SIGNAL( clicked( ) ), this, SLOT( copyLink ( ) ) ); connect( saveButton, SIGNAL( clicked( ) ), this, SLOT( save ( ) ) ); - /* once off check - if remote, check if we have it + /* once off check - if remote, check if we have it * NB: This check might be expensive - and it'll happen often! */ #ifdef DEBUG_ITEM @@ -177,7 +177,7 @@ void SubFileItem::updateItemStatic() progressBar->setFormat("%v kB"); mDivisor = 1000; } - else + else { progressBar->setRange(0, mFileSize); progressBar->setFormat("%v B"); @@ -506,7 +506,7 @@ void SubFileItem::updateItem() break; } - + if (repeat) { #ifdef DEBUG_ITEM @@ -623,7 +623,7 @@ void SubFileItem::download() } } #endif - + // Add possible direct sources. // @@ -639,7 +639,7 @@ void SubFileItem::download() if (!mSrcId.isNull()) sources.push_back(mSrcId); - + rsFiles->FileRequest(mFileName, mFileHash, mFileSize, destination, RS_FILE_REQ_ANONYMOUS_ROUTING, sources); downloadButton->setEnabled(false); diff --git a/retroshare-gui/src/gui/feeds/SubFileItem.h b/retroshare-gui/src/gui/feeds/SubFileItem.h index 23f8e0f67..aedff7064 100644 --- a/retroshare-gui/src/gui/feeds/SubFileItem.h +++ b/retroshare-gui/src/gui/feeds/SubFileItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/feeds/SubFileItem.h * + * retroshare-gui/src/gui/feeds/SubFileItem.h * * * * Copyright (c) 2008, Robert Fernie * * * diff --git a/retroshare-gui/src/gui/gxs/GxsCircleChooser.cpp b/retroshare-gui/src/gui/gxs/GxsCircleChooser.cpp index 9e56c53cd..bfdef6be7 100644 --- a/retroshare-gui/src/gui/gxs/GxsCircleChooser.cpp +++ b/retroshare-gui/src/gui/gxs/GxsCircleChooser.cpp @@ -43,7 +43,7 @@ void GxsCircleChooser::loadCircles(const RsGxsCircleId &defaultId) bool MakeGxsCircleDesc(const RsGxsCircleId &id, QString &desc) { RsGxsCircleDetails details; - + if (rsGxsCircles->getCircleDetails(id, details)) { desc = QString::fromUtf8(details.mCircleName.c_str()); @@ -71,9 +71,9 @@ void GxsCircleChooser::loadGxsCircles() std::cerr << "GxsCircleChooser::loadGxsCircles() ERROR no ids"; std::cerr << std::endl; return; - } + } - int i = 0; + int i = 0; int def = -1; for(auto it(ids.begin()); it != ids.end(); ++it, ++i) { @@ -111,4 +111,4 @@ bool GxsCircleChooser::getChosenCircle(RsGxsCircleId &id) return true; } - + diff --git a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp index afc676bdd..9baec9166 100644 --- a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp @@ -41,7 +41,7 @@ GxsCommentDialog::GxsCommentDialog(QWidget *parent, const RsGxsId &default_autho setGxsService(comment_service); init(default_author); } - + void GxsCommentDialog::init(const RsGxsId& default_author) { ui->refreshButton->hide(); // this is not needed anymore. Let's keep this piece of code for some time just in case. @@ -57,15 +57,15 @@ void GxsCommentDialog::init(const RsGxsId& default_author) connect(ui->idChooser, SIGNAL(currentIndexChanged( int )), this, SLOT(voterSelectionChanged( int ))); connect(ui->idChooser, SIGNAL(idsLoaded()), this, SLOT(idChooserReady())); connect(ui->treeWidget,SIGNAL(commentsLoaded(int)),this,SLOT(notifyCommentsLoaded(int))); - + connect(ui->commentButton, SIGNAL(clicked()), ui->treeWidget, SLOT(makeComment())); connect(ui->sortBox, SIGNAL(currentIndexChanged(int)), this, SLOT(sortComments(int))); - + // default sort method "HOT". ui->treeWidget->sortByColumn(4, Qt::DescendingOrder); - + int S = QFontMetricsF(font()).height() ; - + ui->sortBox->setIconSize(QSize(S*1.5,S*1.5)); } @@ -136,7 +136,7 @@ void GxsCommentDialog::voterSelectionChanged( int index ) std::cerr << std::endl; #endif - RsGxsId voterId; + RsGxsId voterId; switch (ui->idChooser->getChosenId(voterId)) { case GxsIdChooser::KnowId: case GxsIdChooser::UnKnowId: @@ -203,13 +203,13 @@ void GxsCommentDialog::sortComments(int i) { default: case 0: - ui->treeWidget->sortByColumn(4, Qt::DescendingOrder); + ui->treeWidget->sortByColumn(4, Qt::DescendingOrder); break; case 1: - ui->treeWidget->sortByColumn(2, Qt::DescendingOrder); + ui->treeWidget->sortByColumn(2, Qt::DescendingOrder); break; case 2: - ui->treeWidget->sortByColumn(3, Qt::DescendingOrder); + ui->treeWidget->sortByColumn(3, Qt::DescendingOrder); break; } diff --git a/retroshare-gui/src/gui/gxs/GxsCommentDialog.h b/retroshare-gui/src/gui/gxs/GxsCommentDialog.h index 6a3eee16c..f88b098c0 100644 --- a/retroshare-gui/src/gui/gxs/GxsCommentDialog.h +++ b/retroshare-gui/src/gui/gxs/GxsCommentDialog.h @@ -27,7 +27,7 @@ namespace Ui { class GxsCommentDialog; } -class GxsCommentDialog: public QWidget +class GxsCommentDialog: public QWidget { Q_OBJECT diff --git a/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.h b/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.h index 4a21c6457..06a04b987 100644 --- a/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.h +++ b/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.h @@ -38,8 +38,8 @@ public: explicit GxsCreateCommentDialog(RsGxsCommentService *service, const RsGxsGrpMsgIdPair& parentId, const RsGxsMessageId& threadId, const RsGxsId& default_author=RsGxsId(),QWidget *parent = 0); ~GxsCreateCommentDialog(); - void loadComment(const QString &msgText, const QString &msgAuthor, const RsGxsId &msgAuthorId); - + void loadComment(const QString &msgText, const QString &msgAuthor, const RsGxsId &msgAuthorId); + private slots: void createComment(); void checkLength(); diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index 5afb5414b..6f68f9c09 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -40,9 +40,9 @@ // Control of Publish Signatures. -// +// // These are now defined in rsgxsflags.h -// +// // #define FLAG_GROUP_SIGN_PUBLISH_MASK 0x000000ff // #define FLAG_GROUP_SIGN_PUBLISH_ENCRYPTED 0x00000001 // #define FLAG_GROUP_SIGN_PUBLISH_ALLSIGNED 0x00000002 @@ -69,7 +69,7 @@ GxsGroupDialog::GxsGroupDialog(uint32_t enableFlags, uint32_t defaultFlags, QWid { /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); - + init(); } @@ -120,7 +120,7 @@ void GxsGroupDialog::init() ui.filtercomboBox->hide(); //this->resize(this->size().width() - ui.contactsdockWidget->size().width(), this->size().height()); } - + /* Add filter types */ ui.filtercomboBox->addItem(tr("All People")); ui.filtercomboBox->addItem(tr("My Contacts")); @@ -136,14 +136,14 @@ void GxsGroupDialog::init() ui.adminsList->setModus(FriendSelectionWidget::MODUS_CHECK); ui.adminsList->setShowType(FriendSelectionWidget::SHOW_GXS); ui.adminsList->start(); - + /* Setup Reasonable Defaults */ ui.idChooser->loadIds(0,RsGxsId()); ui.circleComboBox->loadCircles(RsGxsCircleId()); ui.localComboBox->loadGroups(0, RsNodeGroupId()); - + ui.groupDesc->setPlaceholderText(tr("Set a descriptive description here")); ui.personal_ifnopub->hide() ; @@ -254,7 +254,7 @@ void GxsGroupDialog::clearForm() void GxsGroupDialog::setupDefaults() { - /* Enable / Show Parts based on Flags */ + /* Enable / Show Parts based on Flags */ if (mDefaultsFlags & GXS_GROUP_DEFAULTS_DISTRIB_MASK) { @@ -350,13 +350,13 @@ void GxsGroupDialog::setupDefaults() ui.antiSpam_perms_CB->setCurrentIndex(1) ; else ui.antiSpam_perms_CB->setCurrentIndex(0) ; - + QString antispam_string ; if(mDefaultsFlags & GXS_GROUP_DEFAULTS_ANTISPAM_TRACK) antispam_string += tr("Message tracking") ; if(mDefaultsFlags & GXS_GROUP_DEFAULTS_ANTISPAM_FAVOR_PGP) antispam_string += (antispam_string.isNull()?"":" and ")+tr("PGP signature required") ; - + ui.antiSpamValueLabel->setText(antispam_string) ; - + #ifndef RS_USE_CIRCLES ui.typeGroup->setEnabled(false); ui.typeGroup_3->setEnabled(false); @@ -375,7 +375,7 @@ void GxsGroupDialog::setupVisibility() ui.distribGroupBox->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DISTRIBUTION); ui.distributionLabel->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DISTRIBUTION); ui.distributionValueLabel->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DISTRIBUTION); - + ui.spamProtection_GB->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ANTI_SPAM); ui.antiSpamLabel->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ANTI_SPAM); ui.antiSpamValueLabel->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ANTI_SPAM); @@ -448,7 +448,7 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description) setupReadonly(); clearForm(); setGroupSignFlags(mGrpMeta.mSignFlags) ; - + RetroShareLink link; /* setup name */ @@ -463,14 +463,14 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description) else ui.lastpostline->setText(DateTime::formatLongDateTime(mGrpMeta.mLastPost)); ui.authorValueLabel->setId(mGrpMeta.mAuthorId); - + ui.createdline->setText(DateTime::formatLongDateTime(mGrpMeta.mPublishTs)); link = RetroShareLink::createMessage(mGrpMeta.mAuthorId, ""); if(!mGrpMeta.mAuthorId.isNull()) ui.authorValueLabel->setText(link.toHtml()); - + ui.IDline->setText(QString::fromStdString(mGrpMeta.mGroupId.toStdString())); ui.descriptiontextEdit->setPlainText(description); @@ -678,7 +678,7 @@ void GxsGroupDialog::createGroup() close(); } - + uint32_t GxsGroupDialog::getGroupSignFlags() { /* grab from the ui options -> */ @@ -693,14 +693,14 @@ uint32_t GxsGroupDialog::getGroupSignFlags() signFlags |= GXS_SERV::FLAG_GROUP_SIGN_PUBLISH_NONEREQ; } - if (ui.personal_required->isChecked()) + if (ui.personal_required->isChecked()) signFlags |= GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_REQUIRED; - if (ui.personal_ifnopub->isChecked()) + if (ui.personal_ifnopub->isChecked()) signFlags |= GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_IFNOPUBSIGN; // Author Signature. - switch(ui.antiSpam_perms_CB->currentIndex()) + switch(ui.antiSpam_perms_CB->currentIndex()) { case 0: break ; case 2: signFlags |= GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG_KNOWN; // no break below, since we want *both* flags in this case. @@ -779,7 +779,7 @@ void GxsGroupDialog::updateCircleOptions() ui.circleComboBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_DISTRIBUTION)); ui.circleComboBox->setVisible(true); } - else + else { ui.circleComboBox->setEnabled(false); ui.circleComboBox->setVisible(false); @@ -790,7 +790,7 @@ void GxsGroupDialog::updateCircleOptions() ui.localComboBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_DISTRIBUTION)); ui.localComboBox->setVisible(true); } - else + else { ui.localComboBox->setEnabled(false); ui.localComboBox->setVisible(false); @@ -845,10 +845,10 @@ void GxsGroupDialog::cancelDialog() close(); } -void GxsGroupDialog::addGroupLogo() +void GxsGroupDialog::addGroupLogo() { QPixmap img = misc::getOpenThumbnailedPicture(this, tr("Load Group Logo"), 64, 64); - + if (img.isNull()) return; @@ -904,7 +904,7 @@ void GxsGroupDialog::setSelectedModerators(const std::set& ids) if(det.mNickname.empty()) moderatorsListString += "[Unknown]"; - + link = RetroShareLink::createMessage(det.mId, ""); if (link.valid()) moderatorsListString += link.toHtml() + " "; diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.h b/retroshare-gui/src/gui/gxs/GxsGroupDialog.h index b5e9417d0..82750c9d6 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.h +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.h @@ -33,7 +33,7 @@ * - programmatically added to the GUI. * - called to fill in fields in the Data Structures. * - * To enable extension, we have a bunch of flags so various options can + * To enable extension, we have a bunch of flags so various options can * be shown / disabled for each specific service. * - Enabled. * - Defaults. diff --git a/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp b/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp index 9197e3665..0fc07af76 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp @@ -48,7 +48,7 @@ GroupShareKey::GroupShareKey(QWidget *parent, const RsGxsGroupId &grpId, int grp ui->keyShareList->setModus(FriendSelectionWidget::MODUS_CHECK); ui->keyShareList->setShowType(FriendSelectionWidget::SHOW_GROUP | FriendSelectionWidget::SHOW_SSL); ui->keyShareList->start(); - + setTyp(); } @@ -76,14 +76,14 @@ void GroupShareKey::setTyp() { if (!rsGxsChannels) return; - + ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/channels.png")); ui->headerFrame->setHeaderText(tr("Share channel publish permissions")); ui->info_Label_ShareKey->setText(tr("You can allow your friends to publish in your channel, or send the publish permissions to another Retroshare instance of yours. Select the friends which you want to be allowed to publish in this channel. Note: it is currently not possible to revoke channel publish permissions.")); } else if(mGrpType == FORUM_KEY_SHARE) { - + ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums.png")); ui->headerFrame->setHeaderText(tr("Share forum admin permissions")); ui->info_Label_ShareKey->setText(tr("You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.")); @@ -93,7 +93,7 @@ void GroupShareKey::setTyp() { if (!rsPosted) return; - + ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png")); ui->headerFrame->setHeaderText(tr("Share board admin permissions")); ui->info_Label_ShareKey->setText(tr("You can allow your friends to edit the board. Select them in the list below. Note: it is not possible to revoke Board admin permissions.")); diff --git a/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp b/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp index a00961fa1..4e4299407 100644 --- a/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp @@ -24,7 +24,7 @@ #include #include -const uint32_t WikiCreateEnabledFlags = ( +const uint32_t WikiCreateEnabledFlags = ( GXS_GROUP_FLAGS_NAME | // GXS_GROUP_FLAGS_ICON | GXS_GROUP_FLAGS_DESCRIPTION | diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp index 0af2631c5..fccdf1c69 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp @@ -30,7 +30,7 @@ // To start with we only have open forums - with distribution controls. -const uint32_t ChannelCreateEnabledFlags = ( +const uint32_t ChannelCreateEnabledFlags = ( GXS_GROUP_FLAGS_NAME | GXS_GROUP_FLAGS_ICON | GXS_GROUP_FLAGS_DESCRIPTION | @@ -40,7 +40,7 @@ const uint32_t ChannelCreateEnabledFlags = ( // GXS_GROUP_FLAGS_PERSONALSIGN | // GXS_GROUP_FLAGS_COMMENTS | // disabled because the UI doesn't handle it yet. Better to hide it then. 0); - + const uint32_t ChannelCreateDefaultsFlags = ( GXS_GROUP_DEFAULTS_DISTRIB_PUBLIC | //GXS_GROUP_DEFAULTS_DISTRIB_GROUP | //GXS_GROUP_DEFAULTS_DISTRIB_LOCAL | @@ -91,7 +91,7 @@ void GxsChannelGroupDialog::initUi() setUiText(UITYPE_BUTTONBOX_OK, tr("Update Channel")); break; } - + setUiText(UITYPE_KEY_SHARE_CHECKBOX, tr("Add Channel Admins")); setUiText(UITYPE_CONTACTS_DOCK, tr("Select Channel Admins")); } diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp index 16d0c307b..941d452b2 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp @@ -25,8 +25,8 @@ #include // To start with we only have open forums - with distribution controls. - -const uint32_t ForumCreateEnabledFlags = ( + +const uint32_t ForumCreateEnabledFlags = ( GXS_GROUP_FLAGS_NAME | // GXS_GROUP_FLAGS_ICON | GXS_GROUP_FLAGS_DESCRIPTION | @@ -38,20 +38,20 @@ const uint32_t ForumCreateEnabledFlags = ( // GXS_GROUP_FLAGS_PERSONALSIGN | // GXS_GROUP_FLAGS_COMMENTS | 0); - + const uint32_t ForumCreateDefaultsFlags = ( GXS_GROUP_DEFAULTS_DISTRIB_PUBLIC | //GXS_GROUP_DEFAULTS_DISTRIB_GROUP | //GXS_GROUP_DEFAULTS_DISTRIB_LOCAL | - + GXS_GROUP_DEFAULTS_PUBLISH_OPEN | //GXS_GROUP_DEFAULTS_PUBLISH_THREADS | //GXS_GROUP_DEFAULTS_PUBLISH_REQUIRED | //GXS_GROUP_DEFAULTS_PUBLISH_ENCRYPTED | - + //GXS_GROUP_DEFAULTS_PERSONAL_PGP | GXS_GROUP_DEFAULTS_PERSONAL_REQUIRED | //GXS_GROUP_DEFAULTS_PERSONAL_IFNOPUB | - + //GXS_GROUP_DEFAULTS_COMMENTS_YES | GXS_GROUP_DEFAULTS_COMMENTS_NO | 0); diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.h b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.h index 75d10a1e1..59d988aef 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.h +++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.h @@ -38,7 +38,7 @@ public: virtual QString helpText() const { return ""; } //MainPage void shareInMessage(const RsGxsGroupId& forum_id, const QList& file_link) ; - + protected: virtual QString getHelpString() const ; virtual RetroShareLink::enumType getLinkType() { return RetroShareLink::TYPE_FORUM; } diff --git a/retroshare-gui/src/gui/help/browser/helpbrowser.cpp b/retroshare-gui/src/gui/help/browser/helpbrowser.cpp index 1da6fb4cf..d0da4b140 100644 --- a/retroshare-gui/src/gui/help/browser/helpbrowser.cpp +++ b/retroshare-gui/src/gui/help/browser/helpbrowser.cpp @@ -70,11 +70,11 @@ HelpBrowser::HelpBrowser(QWidget *parent) /* Hide Search frame */ ui.frmFind->setHidden(true); - + /* Set the splitter pane sizes so that only the txtBrowser pane expands * and set to arbitrary sizes (the minimum sizes will take effect */ QList sizes; - sizes.append(MINIMUM_PANE_SIZE); + sizes.append(MINIMUM_PANE_SIZE); sizes.append(MINIMUM_PANE_SIZE); ui.splitter->setSizes(sizes); ui.splitter->setStretchFactor(LEFT_PANE_INDEX, NO_STRETCH); @@ -91,14 +91,14 @@ HelpBrowser::HelpBrowser(QWidget *parent) connect(ui.actionHome, SIGNAL(triggered()), ui.txtBrowser, SLOT(home())); connect(ui.actionBack, SIGNAL(triggered()), ui.txtBrowser, SLOT(backward())); connect(ui.actionForward, SIGNAL(triggered()), ui.txtBrowser, SLOT(forward())); - connect(ui.txtBrowser, SIGNAL(backwardAvailable(bool)), + connect(ui.txtBrowser, SIGNAL(backwardAvailable(bool)), ui.actionBack, SLOT(setEnabled(bool))); connect(ui.txtBrowser, SIGNAL(forwardAvailable(bool)), ui.actionForward, SLOT(setEnabled(bool))); connect(ui.btnFindNext, SIGNAL(clicked()), this, SLOT(findNext())); connect(ui.btnFindPrev, SIGNAL(clicked()), this, SLOT(findPrev())); connect(ui.btnSearch, SIGNAL(clicked()), this, SLOT(search())); - + /* Load the help topics from XML */ loadContentsFromXml(":/help/" + language() + "/contents.xml"); @@ -130,7 +130,7 @@ HelpBrowser::loadContentsFromXml(QString xmlFile) QString errorString; QFile file(xmlFile); QDomDocument document; - + /* Load the XML contents into the DOM document */ if (!document.setContent(&file, true, &errorString)) { ui.txtBrowser->setPlainText(tr("Error Loading Help Contents:")+" "+errorString); @@ -158,7 +158,7 @@ HelpBrowser::loadContents(const QDomDocument *document, QString &errorString) /* Create the home item */ QTreeWidgetItem *home = createTopicTreeItem(root, 0); ui.treeContents->addTopLevelItem(home); - + /* Process all top-level help topics */ QDomElement child = root.firstChildElement(ELEMENT_TOPIC); while (!child.isNull()) { @@ -170,7 +170,7 @@ HelpBrowser::loadContents(const QDomDocument *document, QString &errorString) /** Parse a Topic element and handle all its children recursively. */ void -HelpBrowser::parseHelpTopic(const QDomElement &topicElement, +HelpBrowser::parseHelpTopic(const QDomElement &topicElement, QTreeWidgetItem *parent) { /* Check that we have a valid help topic */ @@ -214,7 +214,7 @@ HelpBrowser::getResourcePath(const QDomElement &topicElement) /** Creates a new element to be inserted into the topic tree. */ QTreeWidgetItem* -HelpBrowser::createTopicTreeItem(const QDomElement &topicElement, +HelpBrowser::createTopicTreeItem(const QDomElement &topicElement, QTreeWidgetItem *parent) { QTreeWidgetItem *topic = new QTreeWidgetItem(parent); @@ -264,7 +264,7 @@ HelpBrowser::currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *prev) { Q_UNUSED(prev); if (current) { - ui.txtBrowser->setSource(QUrl(current->data(0, + ui.txtBrowser->setSource(QUrl(current->data(0, ROLE_TOPIC_QRC_PATH).toString())); } _foundBefore = false; @@ -285,7 +285,7 @@ HelpBrowser::findTopicItem(QTreeWidgetItem *startItem, QString topic) /* Search through all children of startItem and look for a subtopic match */ for (int i = 0; i < startItem->childCount(); i++) { QTreeWidgetItem *item = startItem->child(i); - + if (subtopic == item->data(0, ROLE_TOPIC_ID).toString().toLower()) { /* Found a subtopic match, so expand this item */ item->setSelected(true); @@ -308,7 +308,7 @@ HelpBrowser::showTopic(QString topic) /* Search for the topic in the contents tree */ QTreeWidgetItem *item = findTopicItem(ui.treeContents->topLevelItem(0), topic); - + if (item) { /* Item was found, so show its location in the hierarchy and select its * tree item. */ @@ -347,14 +347,14 @@ HelpBrowser::find(bool forward) if (ui.lineFind->text().isEmpty()) { return; } - + QTextDocument::FindFlags flags = QTextDocument::FindFlags(); QTextCursor cursor = ui.txtBrowser->textCursor(); QString searchPhrase = ui.lineFind->text(); - + /* Clear status bar */ this->statusBar()->clearMessage(); - + /* Set search direction and other flags */ if (!forward) { flags |= QTextDocument::FindBackward; @@ -365,13 +365,13 @@ HelpBrowser::find(bool forward) if (ui.chkbxWholePhrase->isChecked()) { flags |= QTextDocument::FindWholeWords; } - + /* Check if search phrase is the same as the previous */ if (searchPhrase != _lastFind) { _foundBefore = false; } _lastFind = searchPhrase; - + /* Set the cursor to the appropriate start location if necessary */ if (!cursor.hasSelection()) { if (forward) { @@ -385,26 +385,26 @@ HelpBrowser::find(bool forward) /* Search the page */ QTextCursor found; found = ui.txtBrowser->document()->find(searchPhrase, cursor, flags); - + /* If found, move the cursor to the location */ if (!found.isNull()) { ui.txtBrowser->setTextCursor(found); /* If not found, display appropriate error message */ } else { if (_foundBefore) { - if (forward) + if (forward) this->statusBar()->showMessage(tr("Search reached end of document")); - else + else this->statusBar()->showMessage(tr("Search reached start of document")); } else { this->statusBar()->showMessage(tr("Text not found in document")); } } - + /* Even if not found this time, may have been found previously */ _foundBefore |= !found.isNull(); } - + /** Searches all help pages for the phrase the Search box. * Fills treeSearch with documents containing matches and sets the * status bar text appropriately. @@ -414,12 +414,12 @@ HelpBrowser::search() { /* Clear the list */ ui.treeSearch->clear(); - + /* Don't search if invalid document or blank search phrase */ if (ui.lineSearch->text().isEmpty()) { return; } - + HelpTextBrowser browser; QTextCursor found; QTextDocument::FindFlags flags = QTextDocument::FindWholeWords; @@ -430,7 +430,7 @@ HelpBrowser::search() for (int i=0; i < _elementList.size(); ++i) { /* Load page data into browser */ browser.setSource(QUrl(getResourcePath(_elementList[i]))); - + /* Search current document */ found = browser.document()->find(ui.lineSearch->text(), 0, flags); diff --git a/retroshare-gui/src/gui/help/browser/helpbrowser.h b/retroshare-gui/src/gui/help/browser/helpbrowser.h index acd3947a1..5131d8ad2 100644 --- a/retroshare-gui/src/gui/help/browser/helpbrowser.h +++ b/retroshare-gui/src/gui/help/browser/helpbrowser.h @@ -21,7 +21,7 @@ /* ** \file helpbrowser.h -** \version $Id: helpbrowser.h 2362 2008-02-29 04:30:11Z edmanm $ +** \version $Id: helpbrowser.h 2362 2008-02-29 04:30:11Z edmanm $ ** \brief Displays a list of help topics and content */ @@ -64,7 +64,7 @@ private slots: void contentsItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *prev); /** Called when the user selects a different item in the search tree */ void searchItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *prev); - + private: /** Returns the language in which help topics should appear, or English * ("en") if no translated help files exist for the current GUI language. */ @@ -105,4 +105,4 @@ private: }; #endif - + diff --git a/retroshare-gui/src/gui/help/browser/helptextbrowser.h b/retroshare-gui/src/gui/help/browser/helptextbrowser.h index 71c785157..8501a7d3a 100644 --- a/retroshare-gui/src/gui/help/browser/helptextbrowser.h +++ b/retroshare-gui/src/gui/help/browser/helptextbrowser.h @@ -21,7 +21,7 @@ /* ** \file helptextbrowser.h -** \version $Id: helptextbrowser.h 2679 2008-06-10 03:07:10Z edmanm $ +** \version $Id: helptextbrowser.h 2679 2008-06-10 03:07:10Z edmanm $ ** \brief Displays an HTML-based help document */ diff --git a/retroshare-gui/src/gui/linetypes.h b/retroshare-gui/src/gui/linetypes.h index be4af7d45..85dd7d48b 100644 --- a/retroshare-gui/src/gui/linetypes.h +++ b/retroshare-gui/src/gui/linetypes.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/linetypes.h * + * retroshare-gui/src/gui/linetypes.h * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * diff --git a/retroshare-gui/src/gui/mainpagestack.cpp b/retroshare-gui/src/gui/mainpagestack.cpp index 086a78b8a..99ea8a0f9 100644 --- a/retroshare-gui/src/gui/mainpagestack.cpp +++ b/retroshare-gui/src/gui/mainpagestack.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/mainpagestack.cpp * + * retroshare-gui/src/gui/mainpagestack.cpp * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * diff --git a/retroshare-gui/src/gui/mainpagestack.h b/retroshare-gui/src/gui/mainpagestack.h index 6e8e53b05..234df1c15 100644 --- a/retroshare-gui/src/gui/mainpagestack.h +++ b/retroshare-gui/src/gui/mainpagestack.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/mainpagestack.h * + * retroshare-gui/src/gui/mainpagestack.h * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * @@ -45,13 +45,13 @@ public: /** Returns a list of all pages in the stack. */ QList pages() { return _pages.values(); } - + public slots: /** Displays the page associated with the activated action. */ void showPage(QAction *pageAction); /** Adjusts the size of the Main page and the Main window. */ void onCurrentChanged(int index); - + private: /** Maps an action to a Main page. */ QHash _pages; diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.h b/retroshare-gui/src/gui/msgs/MessageComposer.h index 180840208..259e56e75 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.h +++ b/retroshare-gui/src/gui/msgs/MessageComposer.h @@ -40,7 +40,7 @@ class RSTreeWidgetItemCompareRole; struct RsGxsChannelGroup; struct RsGxsForumGroup; -class MessageComposer : public QMainWindow +class MessageComposer : public QMainWindow { Q_OBJECT @@ -90,7 +90,7 @@ public slots: void sendMessage(); void cancelMessage(); void addImage(); - + void changeFormatType(int styleIndex ); protected: @@ -163,7 +163,7 @@ private slots: void tagAboutToShow(); void tagSet(int tagId, bool set); void tagRemoveAll(); - + void on_closeInfoFrameButton_Distant_clicked(); void on_closeInfoFrameButton_SizeLimit_clicked(); @@ -220,7 +220,7 @@ private: *actionRedo, *actionCut, *actionCopy, - *actionPaste, + *actionPaste, *actionDisc, *actionCircle, *actionSquare, diff --git a/retroshare-gui/src/gui/msgs/MessageInterface.h b/retroshare-gui/src/gui/msgs/MessageInterface.h index 77cf4b534..fcdcd3272 100644 --- a/retroshare-gui/src/gui/msgs/MessageInterface.h +++ b/retroshare-gui/src/gui/msgs/MessageInterface.h @@ -21,7 +21,7 @@ #ifndef MRK_MESSAGE_INTERFACE_H #define MRK_MESSAGE_INTERFACE_H -/* This header will be used to switch the GUI from +/* This header will be used to switch the GUI from * the old RsMsg to the new RsMail interface. * * The GUI uses similar interface, with the differences diff --git a/retroshare-gui/src/gui/msgs/MessageWindow.cpp b/retroshare-gui/src/gui/msgs/MessageWindow.cpp index 0c9abf2a2..4313965f8 100644 --- a/retroshare-gui/src/gui/msgs/MessageWindow.cpp +++ b/retroshare-gui/src/gui/msgs/MessageWindow.cpp @@ -35,7 +35,7 @@ MessageWindow::MessageWindow(QWidget *parent, Qt::WindowFlags flags) { /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); - + setAttribute ( Qt::WA_DeleteOnClose, true ); actionSaveAs = NULL; @@ -55,7 +55,7 @@ MessageWindow::MessageWindow(QWidget *parent, Qt::WindowFlags flags) ui.actionTextUnderIcon->setData(Qt::ToolButtonTextUnderIcon); msgWidget = NULL; - + // create tag menu TagsMenu *menu = new TagsMenu (tr("Tags"), this); connect(menu, SIGNAL(aboutToShow()), this, SLOT(tagAboutToShow())); diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp index f678adeb4..ca4522364 100644 --- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/MessagesDialog.cpp * + * retroshare-gui/src/gui/msgs/MessagesDialog.cpp * * * * Copyright (c) 2006 Crypton * * * @@ -188,7 +188,7 @@ MessagesDialog::MessagesDialog(QWidget *parent) // Set initial size of the splitter ui.listSplitter->setStretchFactor(0, 0); ui.listSplitter->setStretchFactor(1, 1); - + // Set initial size of the splitter ui.boxSplitter->setStretchFactor(0, 0); ui.boxSplitter->setStretchFactor(1, 1); @@ -1336,13 +1336,13 @@ void MessagesDialog::updateMessageSummaryList() tagCount [*tagId] = nCount; } - if (it->msgflags & RS_MSG_STAR) + if (it->msgflags & RS_MSG_STAR) ++starredCount; - if (it->msgflags & RS_MSG_SYSTEM) + if (it->msgflags & RS_MSG_SYSTEM) ++systemCount; - if (it->msgflags & RS_MSG_SPAM) + if (it->msgflags & RS_MSG_SPAM) ++spamCount; /* calculate box */ diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.h b/retroshare-gui/src/gui/msgs/MessagesDialog.h index 7f9573f81..299e3dc7e 100644 --- a/retroshare-gui/src/gui/msgs/MessagesDialog.h +++ b/retroshare-gui/src/gui/msgs/MessagesDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/MessagesDialog.h * + * retroshare-gui/src/gui/msgs/MessagesDialog.h * * * * Copyright (c) 2006 Crypton * * * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * * along with this program. If not, see . * * * - *******************************************************************************/ + ******************************************************************************/ #ifndef _MESSAGESDIALOG_H #define _MESSAGESDIALOG_H @@ -103,7 +103,7 @@ private slots: void filterChanged(const QString &text); void filterColumnChanged(int column); - + void tagAboutToShow(); void tagSet(int tagId, bool set); void tagRemoveAll(); diff --git a/retroshare-gui/src/gui/msgs/textformat.h b/retroshare-gui/src/gui/msgs/textformat.h index 2f9785129..36577a51b 100644 --- a/retroshare-gui/src/gui/msgs/textformat.h +++ b/retroshare-gui/src/gui/msgs/textformat.h @@ -1,5 +1,5 @@ /******************************************************************************* - * retroshare-gui/src/gui/msgs/TagsMenu.h * + * retroshare-gui/src/gui/msgs/textformat.h * * * * Copyright (C) 2006-2010 by Retroshare Team * * Copyright (C) 2008-2009 Mehrdad Momeny * @@ -46,7 +46,7 @@ public: /// Image properties ImageTitle = 0x100020, ImageAlternateText = 0x100021, - + HasCodeStyle = 0x100030, /// Block Properties diff --git a/retroshare-gui/src/gui/plugins/PluginInterface.h b/retroshare-gui/src/gui/plugins/PluginInterface.h index 03b0265eb..d88e7ac3f 100644 --- a/retroshare-gui/src/gui/plugins/PluginInterface.h +++ b/retroshare-gui/src/gui/plugins/PluginInterface.h @@ -33,7 +33,7 @@ QT_END_NAMESPACE //! a base class for plugins -//! All plugin classes must inherite this class and QObject. +//! All plugin classes must inherite this class and QObject. class PluginInterface { public: @@ -42,7 +42,7 @@ public: public slots: //! A description of the plugin - //! A description of the plugin. Is not used in current version. + //! A description of the plugin. Is not used in current version. virtual QString pluginDescription() const = 0; //! The plugin's name @@ -68,4 +68,4 @@ Q_DECLARE_INTERFACE(PluginInterface, QT_END_NAMESPACE #endif - + diff --git a/retroshare-gui/src/gui/profile/StatusMessage.cpp b/retroshare-gui/src/gui/profile/StatusMessage.cpp index 723fe77ce..533e12d66 100644 --- a/retroshare-gui/src/gui/profile/StatusMessage.cpp +++ b/retroshare-gui/src/gui/profile/StatusMessage.cpp @@ -28,10 +28,10 @@ StatusMessage::StatusMessage(QWidget *parent) { /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); - + connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(save())); connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(close())); - + ui.txt_StatusMessage->setText(QString::fromUtf8(rsMsgs->getCustomStateString().c_str())); } diff --git a/retroshare-gui/src/gui/settings/AboutPage.cpp b/retroshare-gui/src/gui/settings/AboutPage.cpp index 64365dd57..461a048d9 100644 --- a/retroshare-gui/src/gui/settings/AboutPage.cpp +++ b/retroshare-gui/src/gui/settings/AboutPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/AboutPage.cpp * + * retroshare-gui/src/gui/settings/AboutPage.cpp * * * * Copyright 2009, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/AboutPage.h b/retroshare-gui/src/gui/settings/AboutPage.h index 39b2da6ed..5b332c097 100644 --- a/retroshare-gui/src/gui/settings/AboutPage.h +++ b/retroshare-gui/src/gui/settings/AboutPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/AboutPage.h * + * retroshare-gui/src/gui/settings/AboutPage.h * * * * Copyright 2009, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/AddFileAssociationDialog.cpp b/retroshare-gui/src/gui/settings/AddFileAssociationDialog.cpp index 2a127d9b5..0ec8541c0 100755 --- a/retroshare-gui/src/gui/settings/AddFileAssociationDialog.cpp +++ b/retroshare-gui/src/gui/settings/AddFileAssociationDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/AddFileAssociationDialog.cpp * + * retroshare-gui/src/gui/settings/AddFileAssociationDialog.cpp * * * * Copyright 2009, Retroshare Team * * Copyright 2009, Oleksiy Bilyanskyy * diff --git a/retroshare-gui/src/gui/settings/AddFileAssociationDialog.h b/retroshare-gui/src/gui/settings/AddFileAssociationDialog.h index 833ecd5ab..70f6b77da 100755 --- a/retroshare-gui/src/gui/settings/AddFileAssociationDialog.h +++ b/retroshare-gui/src/gui/settings/AddFileAssociationDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/AddFileAssociationDialog.h * + * retroshare-gui/src/gui/settings/AddFileAssociationDialog.h * * * * Copyright 2009, Retroshare Team * * Copyright 2009, Oleksiy Bilyanskyy * @@ -62,7 +62,7 @@ protected: QPushButton* selectExecutable; QLabel* commandLabel; QLineEdit* commandEdit; - QDialogButtonBox *buttonBox; + QDialogButtonBox *buttonBox; protected slots: void fileTypeEdited(const QString & text ); diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp index 0a767a20f..6636eff26 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.cpp +++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/AppearancePage.cpp * + * retroshare-gui/src/gui/settings/AppearancePage.cpp * * * * Copyright 2009, Retroshare Team * * * @@ -165,7 +165,7 @@ void AppearancePage::updateRbtPageOnToolBar() { Settings->setPageButtonLoc(!ui.mainPageButtonType_CB->currentIndex()); Settings->setActionButtonLoc(!ui.mainPageButtonType_CB->currentIndex()); - + int index = ui.mainPageButtonType_CB->currentIndex(); if (index != 0) { ui.cmboTollButtonsStyle->hide(); @@ -271,7 +271,7 @@ void AppearancePage::load() index = ui.cmboStyleSheet->findData(""); } whileBlocking(ui.cmboStyleSheet)->setCurrentIndex(index); - + index = ui.mainPageButtonType_CB->findData(Settings->getPageButtonLoc()); if (index != 0) { ui.cmboTollButtonsStyle->show(); diff --git a/retroshare-gui/src/gui/settings/ChannelPage.cpp b/retroshare-gui/src/gui/settings/ChannelPage.cpp index 2a5f413d2..0f64b0fac 100644 --- a/retroshare-gui/src/gui/settings/ChannelPage.cpp +++ b/retroshare-gui/src/gui/settings/ChannelPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/ChannelPage.cpp * + * retroshare-gui/src/gui/settings/ChannelPage.cpp * * * * Copyright 2006, Crypton * * * @@ -48,7 +48,7 @@ ChannelPage::~ChannelPage() void ChannelPage::load() { ui.groupFrameSettingsWidget->loadSettings(GroupFrameSettings::Channel); - + Settings->beginGroup(QString("ChannelPostsWidget")); whileBlocking(ui.emoteicon_checkBox)->setChecked(Settings->value("Emoteicons_ChannelDecription", true).toBool()); Settings->endGroup(); diff --git a/retroshare-gui/src/gui/settings/ChannelPage.h b/retroshare-gui/src/gui/settings/ChannelPage.h index c89120a40..7e884d0e2 100644 --- a/retroshare-gui/src/gui/settings/ChannelPage.h +++ b/retroshare-gui/src/gui/settings/ChannelPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/ChannelPage.h * + * retroshare-gui/src/gui/settings/ChannelPage.h * * * * Copyright 2006, Crypton * * * @@ -44,7 +44,7 @@ public: private slots: void updateEmotes(); - + // Function to update the maximum size allowed for auto download in channels void updateMaxAutoDownloadSizeLimit(int value); diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp index 344257480..2d4986f60 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.cpp +++ b/retroshare-gui/src/gui/settings/ChatPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/ChatPage.cpp * + * retroshare-gui/src/gui/settings/ChatPage.cpp * * * * Copyright 2006, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/ChatPage.h b/retroshare-gui/src/gui/settings/ChatPage.h index 4edb66747..6ebcec644 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.h +++ b/retroshare-gui/src/gui/settings/ChatPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/ChatPage.h * + * retroshare-gui/src/gui/settings/ChatPage.h * * * * Copyright 2006, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp index 45e2a0b06..3d9d4261c 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.cpp +++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/CryptoPage.cpp * + * retroshare-gui/src/gui/settings/CryptoPage.cpp * * * * Copyright 2006, Retroshare Team * * * @@ -111,7 +111,7 @@ void CryptoPage::showEvent ( QShowEvent * /*event*/ ) std::string invite ; rsPeers->getShortInvite(invite,rsPeers->getOwnId(),RetroshareInviteFlags::RADIX_FORMAT | RsPeers::defaultCertificateFlags); ui.retroshareId_content_LB->setText(QString::fromUtf8(invite.c_str())); - + /* set retroshare version */ ui.version->setText(RsApplication::retroshareVersion(true)); @@ -121,8 +121,8 @@ void CryptoPage::showEvent ( QShowEvent * /*event*/ ) int friends = ids.size(); ui.friendsEdit->setText(QString::number(friends)); - - + + QString string ; string = rsFiles->getPartialsDirectory().c_str(); QString datadir = string; diff --git a/retroshare-gui/src/gui/settings/CryptoPage.h b/retroshare-gui/src/gui/settings/CryptoPage.h index f45e4b29a..074be3bed 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.h +++ b/retroshare-gui/src/gui/settings/CryptoPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/CryptoPage.h * + * retroshare-gui/src/gui/settings/CryptoPage.h * * * * Copyright 2006, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp b/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp index fe7e36a7b..6db88adb4 100755 --- a/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp +++ b/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/FileAssociationPage.cpp * + * retroshare-gui/src/gui/settings/FileAssociationPage.cpp * * * * Copyright 2009, Retroshare Team * * Copyright 2009, Oleksiy Bilyanskyy * diff --git a/retroshare-gui/src/gui/settings/FileAssociationsPage.h b/retroshare-gui/src/gui/settings/FileAssociationsPage.h index 0bf79d705..cfd62fc44 100755 --- a/retroshare-gui/src/gui/settings/FileAssociationsPage.h +++ b/retroshare-gui/src/gui/settings/FileAssociationsPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/FileAssociationPage.h * + * retroshare-gui/src/gui/settings/FileAssociationPage.h * * * * Copyright 2009, Retroshare Team * * Copyright 2009, Oleksiy Bilyanskyy * diff --git a/retroshare-gui/src/gui/settings/ForumPage.cpp b/retroshare-gui/src/gui/settings/ForumPage.cpp index ee0d32566..de93e8615 100644 --- a/retroshare-gui/src/gui/settings/ForumPage.cpp +++ b/retroshare-gui/src/gui/settings/ForumPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/ForumPage.cpp * + * retroshare-gui/src/gui/settings/ForumPage.cpp * * * * Copyright 2006, Crypton * * * diff --git a/retroshare-gui/src/gui/settings/ForumPage.h b/retroshare-gui/src/gui/settings/ForumPage.h index 0c8ed402f..b406c8fec 100644 --- a/retroshare-gui/src/gui/settings/ForumPage.h +++ b/retroshare-gui/src/gui/settings/ForumPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/ForumPage.h * + * retroshare-gui/src/gui/settings/ForumPage.h * * * * Copyright 2006, Crypton * * * diff --git a/retroshare-gui/src/gui/settings/GeneralPage.cpp b/retroshare-gui/src/gui/settings/GeneralPage.cpp index 88b3a52bc..d63ef5464 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.cpp +++ b/retroshare-gui/src/gui/settings/GeneralPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/GeneralPage.h * + * retroshare-gui/src/gui/settings/GeneralPage.h * * * * Copyright 2009, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/GeneralPage.h b/retroshare-gui/src/gui/settings/GeneralPage.h index a2413e748..59712ad02 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.h +++ b/retroshare-gui/src/gui/settings/GeneralPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/GeneralPage.h * + * retroshare-gui/src/gui/settings/GeneralPage.h * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * diff --git a/retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.cpp b/retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.cpp index 2ea51fd57..596446c3c 100644 --- a/retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.cpp +++ b/retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/GroupFrameSettingsWidget.cpp * + * retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.cpp * * * * Copyright 2009, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.h b/retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.h index 7036f7f99..eef44424c 100644 --- a/retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.h +++ b/retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/GroupFrameSettingsWidget.h * + * retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.h * * * * Copyright 2009, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.cc b/retroshare-gui/src/gui/settings/JsonApiPage.cc index a7ad05574..dc16e23d2 100644 --- a/retroshare-gui/src/gui/settings/JsonApiPage.cc +++ b/retroshare-gui/src/gui/settings/JsonApiPage.cc @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/JsonApiPage.cpp * + * retroshare-gui/src/gui/settings/JsonApiPage.cpp * * * * Copyright (C) 2018 Gioacchino Mazzurco * * * diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.h b/retroshare-gui/src/gui/settings/JsonApiPage.h index 9d5755213..fe75ee014 100644 --- a/retroshare-gui/src/gui/settings/JsonApiPage.h +++ b/retroshare-gui/src/gui/settings/JsonApiPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/JsonApiPage.h * + * retroshare-gui/src/gui/settings/JsonApiPage.h * * * * Copyright (C) 2018-2020 Gioacchino Mazzurco * * * diff --git a/retroshare-gui/src/gui/settings/MessagePage.cpp b/retroshare-gui/src/gui/settings/MessagePage.cpp index ac16048b2..3f72d03f4 100644 --- a/retroshare-gui/src/gui/settings/MessagePage.cpp +++ b/retroshare-gui/src/gui/settings/MessagePage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/MessagePage.cpp * + * retroshare-gui/src/gui/settings/MessagePage.cpp * * * * Copyright (C) 2006 Crypton * * * diff --git a/retroshare-gui/src/gui/settings/MessagePage.h b/retroshare-gui/src/gui/settings/MessagePage.h index e226a4387..0916030ec 100644 --- a/retroshare-gui/src/gui/settings/MessagePage.h +++ b/retroshare-gui/src/gui/settings/MessagePage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/MessagePage.h * + * retroshare-gui/src/gui/settings/MessagePage.h * * * * Copyright (C) 2006 Crypton * * * diff --git a/retroshare-gui/src/gui/settings/NewTag.cpp b/retroshare-gui/src/gui/settings/NewTag.cpp index bfc1b16b9..e0d443cda 100644 --- a/retroshare-gui/src/gui/settings/NewTag.cpp +++ b/retroshare-gui/src/gui/settings/NewTag.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/NewTag.cpp * + * retroshare-gui/src/gui/settings/NewTag.cpp * * * * Copyright 2009, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/NewTag.h b/retroshare-gui/src/gui/settings/NewTag.h index f4ebe5479..63ed203cc 100644 --- a/retroshare-gui/src/gui/settings/NewTag.h +++ b/retroshare-gui/src/gui/settings/NewTag.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/NewTag.h * + * retroshare-gui/src/gui/settings/NewTag.h * * * * Copyright 2010, Retroshare Team * * * @@ -46,7 +46,7 @@ private slots: void textChanged(const QString &); void setTagColor(); - + private: void showColor(QRgb color); diff --git a/retroshare-gui/src/gui/settings/NotifyPage.cpp b/retroshare-gui/src/gui/settings/NotifyPage.cpp index 189a93cc2..1dd6bc4d8 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.cpp +++ b/retroshare-gui/src/gui/settings/NotifyPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/NotifyPage.cpp * + * retroshare-gui/src/gui/settings/NotifyPage.cpp * * * * Copyright 2009, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/NotifyPage.h b/retroshare-gui/src/gui/settings/NotifyPage.h index 3e240c1da..db0260688 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.h +++ b/retroshare-gui/src/gui/settings/NotifyPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/NotifyPage.h * + * retroshare-gui/src/gui/settings/NotifyPage.h * * * * Copyright 2009, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/PeoplePage.cpp b/retroshare-gui/src/gui/settings/PeoplePage.cpp index c528db090..90f1c5be7 100644 --- a/retroshare-gui/src/gui/settings/PeoplePage.cpp +++ b/retroshare-gui/src/gui/settings/PeoplePage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/PeoplePage.cpp * + * retroshare-gui/src/gui/settings/PeoplePage.cpp * * * * Copyright 2006, Crypton * * * diff --git a/retroshare-gui/src/gui/settings/PluginItem.cpp b/retroshare-gui/src/gui/settings/PluginItem.cpp index f3b141e39..90b4320d6 100644 --- a/retroshare-gui/src/gui/settings/PluginItem.cpp +++ b/retroshare-gui/src/gui/settings/PluginItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/PluginItem.cpp * + * retroshare-gui/src/gui/settings/PluginItem.cpp * * * * Copyright 2011, Cyril Soler * * * @@ -39,10 +39,10 @@ PluginItem::PluginItem(const QString& pluginVersion, int id, const QString& plug QObject::connect(_configure_PB,SIGNAL(clicked()),this,SLOT(configurePlugin())) ; QObject::connect(_about_PB,SIGNAL(clicked()),this,SLOT(aboutPlugin())) ; - + QObject::connect(enableButton,SIGNAL(clicked()),this,SLOT(enablePlugin())) ; QObject::connect(disableButton,SIGNAL(clicked()),this,SLOT(disablePlugin())) ; - + expandFrame->hide(); } @@ -50,7 +50,7 @@ void PluginItem::enablePlugin() { emit( pluginEnabled(_hashLabel->text()) ) ; infoLabel->show(); - disableButton->show(); + disableButton->show(); enableButton->hide(); } @@ -59,7 +59,7 @@ void PluginItem::disablePlugin() emit( pluginDisabled(_hashLabel->text()) ) ; infoLabel->hide(); enableButton->show(); - disableButton->hide(); + disableButton->hide(); } void PluginItem::aboutPlugin() diff --git a/retroshare-gui/src/gui/settings/PluginsPage.cpp b/retroshare-gui/src/gui/settings/PluginsPage.cpp index 63c6880d3..ae18690ef 100644 --- a/retroshare-gui/src/gui/settings/PluginsPage.cpp +++ b/retroshare-gui/src/gui/settings/PluginsPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/PluginsPage.cpp * + * retroshare-gui/src/gui/settings/PluginsPage.cpp * * * * Copyright 2006, Crypton * * * diff --git a/retroshare-gui/src/gui/settings/PluginsPage.h b/retroshare-gui/src/gui/settings/PluginsPage.h index 1e46eb01a..bd4bcac47 100644 --- a/retroshare-gui/src/gui/settings/PluginsPage.h +++ b/retroshare-gui/src/gui/settings/PluginsPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/PluginsPage.h * + * retroshare-gui/src/gui/settings/PluginsPage.h * * * * Copyright 2006, Crypton * * * diff --git a/retroshare-gui/src/gui/settings/PostedPage.cpp b/retroshare-gui/src/gui/settings/PostedPage.cpp index f4c178705..8a2b5bb26 100644 --- a/retroshare-gui/src/gui/settings/PostedPage.cpp +++ b/retroshare-gui/src/gui/settings/PostedPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/PostedPage.cpp * + * retroshare-gui/src/gui/settings/PostedPage.cpp * * * * Copyright 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp index 9286f4020..563e1bf91 100644 --- a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp +++ b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/RSPermissionMatrixWidget.cpp * + * retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h index c72649a52..dfe91421f 100644 --- a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h +++ b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/RSPermissionMatrixWidget.h * + * retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/RsharePeerSettings.cpp b/retroshare-gui/src/gui/settings/RsharePeerSettings.cpp index a9ea1394a..ce9d92de8 100644 --- a/retroshare-gui/src/gui/settings/RsharePeerSettings.cpp +++ b/retroshare-gui/src/gui/settings/RsharePeerSettings.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/RsharePeerSettings.cpp * + * retroshare-gui/src/gui/settings/RsharePeerSettings.cpp * * * * Copyright (c) 2010, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/RsharePeerSettings.h b/retroshare-gui/src/gui/settings/RsharePeerSettings.h index 27de2eaae..f9ca0b417 100644 --- a/retroshare-gui/src/gui/settings/RsharePeerSettings.h +++ b/retroshare-gui/src/gui/settings/RsharePeerSettings.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/RsharePeerSettings.h * + * retroshare-gui/src/gui/settings/RsharePeerSettings.h * * * * Copyright (c) 2010, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp index 9fba74a84..168cdbb13 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.cpp +++ b/retroshare-gui/src/gui/settings/ServerPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/ServerPage.cpp * + * retroshare-gui/src/gui/settings/ServerPage.cpp * * * * Copyright (c) 2006 Crypton * * * diff --git a/retroshare-gui/src/gui/settings/ServerPage.h b/retroshare-gui/src/gui/settings/ServerPage.h index 47d08a3f0..beaf2b27f 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.h +++ b/retroshare-gui/src/gui/settings/ServerPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/ServerPage.h * + * retroshare-gui/src/gui/settings/ServerPage.h * * * * Copyright (c) 2006 Crypton * * * diff --git a/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp b/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp index 84df07589..a760150e2 100644 --- a/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp +++ b/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/ServicePermissionPage.cpp * + * retroshare-gui/src/gui/settings/ServicePermissionPage.cpp * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/ServicePermissionsPage.h b/retroshare-gui/src/gui/settings/ServicePermissionsPage.h index 493090e7e..6c24c24ca 100644 --- a/retroshare-gui/src/gui/settings/ServicePermissionsPage.h +++ b/retroshare-gui/src/gui/settings/ServicePermissionsPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/ServicePermissionPage.h * + * retroshare-gui/src/gui/settings/ServicePermissionPage.h * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/SoundPage.cpp b/retroshare-gui/src/gui/settings/SoundPage.cpp index 57e3aa784..3b12904d6 100644 --- a/retroshare-gui/src/gui/settings/SoundPage.cpp +++ b/retroshare-gui/src/gui/settings/SoundPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/SoundPage.cpp * + * retroshare-gui/src/gui/settings/SoundPage.cpp * * * * Copyright (c) 2009 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/SoundPage.h b/retroshare-gui/src/gui/settings/SoundPage.h index 66a6abab5..bf23303a0 100644 --- a/retroshare-gui/src/gui/settings/SoundPage.h +++ b/retroshare-gui/src/gui/settings/SoundPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/SoundPage.h * + * retroshare-gui/src/gui/settings/SoundPage.h * * * * Copyright (c) 2009 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp index 5b3b49908..e7731af90 100644 --- a/retroshare-gui/src/gui/settings/TransferPage.cpp +++ b/retroshare-gui/src/gui/settings/TransferPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/TransferPage.cpp * + * retroshare-gui/src/gui/settings/TransferPage.cpp * * * * Copyright (c) 2010 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/TransferPage.h b/retroshare-gui/src/gui/settings/TransferPage.h index 6e9413366..d17a8ddd8 100644 --- a/retroshare-gui/src/gui/settings/TransferPage.h +++ b/retroshare-gui/src/gui/settings/TransferPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/TransferPage.h * + * retroshare-gui/src/gui/settings/TransferPage.h * * * * Copyright (c) 2010 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/WebuiPage.cpp b/retroshare-gui/src/gui/settings/WebuiPage.cpp index 4b36b758c..ee9580b7f 100644 --- a/retroshare-gui/src/gui/settings/WebuiPage.cpp +++ b/retroshare-gui/src/gui/settings/WebuiPage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/WebuiPage.cpp * + * retroshare-gui/src/gui/settings/WebuiPage.cpp * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/WebuiPage.h b/retroshare-gui/src/gui/settings/WebuiPage.h index 760b695b1..8d16388f2 100644 --- a/retroshare-gui/src/gui/settings/WebuiPage.h +++ b/retroshare-gui/src/gui/settings/WebuiPage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/WebuiPage.h * + * retroshare-gui/src/gui/settings/WebuiPage.h * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/rsettings.cpp b/retroshare-gui/src/gui/settings/rsettings.cpp index 95c3cdbb7..3eb1cf9f1 100644 --- a/retroshare-gui/src/gui/settings/rsettings.cpp +++ b/retroshare-gui/src/gui/settings/rsettings.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/rsettings.cpp * + * retroshare-gui/src/gui/settings/rsettings.cpp * * * * Copyright (c) 2008, crypton * * Copyright (c) 2008, Matt Edman, Justin Hipple * diff --git a/retroshare-gui/src/gui/settings/rsettings.h b/retroshare-gui/src/gui/settings/rsettings.h index d37525ceb..c20e5ce0e 100644 --- a/retroshare-gui/src/gui/settings/rsettings.h +++ b/retroshare-gui/src/gui/settings/rsettings.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/rsettings.h * + * retroshare-gui/src/gui/settings/rsettings.h * * * * Copyright (c) 2008, crypton * * Copyright (c) 2008, Matt Edman, Justin Hipple * @@ -71,7 +71,7 @@ protected: private: /** Association of setting key names to default setting values. */ - QHash _defaults; + QHash _defaults; }; #endif diff --git a/retroshare-gui/src/gui/settings/rsettingswin.cpp b/retroshare-gui/src/gui/settings/rsettingswin.cpp index 98c6dbdcb..d1af8e429 100644 --- a/retroshare-gui/src/gui/settings/rsettingswin.cpp +++ b/retroshare-gui/src/gui/settings/rsettingswin.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/rsettingswin.cpp * + * retroshare-gui/src/gui/settings/rsettingswin.cpp * * * * Copyright (c) 2008, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/rsettingswin.h b/retroshare-gui/src/gui/settings/rsettingswin.h index 47eb33e4b..908293691 100755 --- a/retroshare-gui/src/gui/settings/rsettingswin.h +++ b/retroshare-gui/src/gui/settings/rsettingswin.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/rsettingswin.h * + * retroshare-gui/src/gui/settings/rsettingswin.h * * * * Copyright (c) 2008, Retroshare Team * * * diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp index 887d4276f..1ccf59d2f 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.cpp +++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/settings/rsharesettings.cpp * + * retroshare-gui/src/gui/settings/rsharesettings.cpp * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * @@ -68,7 +68,7 @@ #if defined(Q_OS_WIN) #define STARTUP_REG_KEY "Software\\Microsoft\\Windows\\CurrentVersion\\Run" -#define RETROSHARE_REG_KEY "RetroShare" +#define RETROSHARE_REG_KEY "RetroShare" #endif /* Default bandwidth graph settings */ @@ -105,7 +105,7 @@ RshareSettings::RshareSettings() } void RshareSettings::initSettings() -{ +{ #ifdef Q_OS_LINUX // use GTK as default style on linux setDefault(SETTING_STYLE, "GTK+"); @@ -180,7 +180,7 @@ QString RshareSettings::getSheetName() } /** Sets the sheetname.*/ void RshareSettings::setSheetName(const QString& sheet) -{ +{ setValue(SETTING_SHEETNAME, sheet); } @@ -248,18 +248,18 @@ int RshareSettings::computeBestIconSize(int n_sizes,int *sizes,int recommended_s float default_size = QFontMetricsF(QWidget().font()).height()/16.0 * recommended_size ; float closest_ratio_dist = 10000.0f ; int best_default_size = sizes[0] ; - + for(int i=0;i * * * diff --git a/retroshare-gui/src/gui/statistics/BWGraph.h b/retroshare-gui/src/gui/statistics/BWGraph.h index 51ce3d3e3..22af2a0b4 100644 --- a/retroshare-gui/src/gui/statistics/BWGraph.h +++ b/retroshare-gui/src/gui/statistics/BWGraph.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/BWGraph.h * + * retroshare-gui/src/gui/statistics/BWGraph.h * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp b/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp index b1bc6814e..f48dbc7dc 100644 --- a/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp +++ b/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/BandwidthGraphWindow.cpp * + * retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * @@ -170,7 +170,7 @@ BandwidthGraph::loadSettings() whileBlocking(ui.chkSendRate )->setChecked(bool(defaultdirection & BWGraphSource::DIRECTION_UP )); whileBlocking(ui.chkReceiveRate)->setChecked(bool(defaultdirection & BWGraphSource::DIRECTION_DOWN)); - + /* Default Settings for the Graph */ ui.frmGraph->setDirection(BWGraphSource::DIRECTION_UP | BWGraphSource::DIRECTION_DOWN); @@ -229,7 +229,7 @@ void BandwidthGraph::saveSettings() } /** Simply restores the previously saved settings. */ -void +void BandwidthGraph::cancelChanges() { /* Hide the settings frame and reset toggle button */ @@ -244,7 +244,7 @@ void BandwidthGraph::showSettingsFrame(bool show) { static QSize minSize = minimumSize(); - + QSize newSize = size(); if (show) { /* Extend the bottom of the bandwidth graph and show the settings */ @@ -259,7 +259,7 @@ BandwidthGraph::showSettingsFrame(bool show) ui.frmSettings->setVisible(false); // ui.btnToggleSettings->setChecked(false); // ui.btnToggleSettings->setText(tr("Show Settings")); - + /* 6 = vertical spacing between the settings frame and graph frame */ newSize.setHeight(newSize.height() - ui.frmSettings->height() - 6); setMinimumSize(minSize); @@ -271,7 +271,7 @@ BandwidthGraph::showSettingsFrame(bool show) void BandwidthGraph::setOpacity(int value) { qreal newValue = value / 100.0; - + /* Opacity only supported by Mac and Win32 */ #if defined(Q_OS_MAC) this->setWindowOpacity(newValue); diff --git a/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.h b/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.h index 5ec993f50..fad6eb5ad 100644 --- a/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.h +++ b/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/BandwidthGraphWindow.h * + * retroshare-gui/src/gui/statistics/BandwidthGraphWindow.h * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * diff --git a/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.cpp b/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.cpp index a27335ad9..0924fd19a 100644 --- a/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.cpp +++ b/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/BandwidthStatsWidget.cpp * + * retroshare-gui/src/gui/statistics/BandwidthStatsWidget.cpp * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h b/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h index 0445ab76f..3437fe87f 100644 --- a/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h +++ b/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/BandwidthStatsWidget.h * + * retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statistics/BwCtrlWindow.cpp b/retroshare-gui/src/gui/statistics/BwCtrlWindow.cpp index adc65ab82..23718c2d2 100644 --- a/retroshare-gui/src/gui/statistics/BwCtrlWindow.cpp +++ b/retroshare-gui/src/gui/statistics/BwCtrlWindow.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/BwCtrlWindow.cpp * + * retroshare-gui/src/gui/statistics/BwCtrlWindow.cpp * * * * Copyright (c) 2012 Robert Fernie * * * @@ -178,14 +178,14 @@ QSize BWListDelegate::sizeHint(const QStyleOptionViewItem & option/*option*/, co //return QSize(50*fact,17*fact); } -BwCtrlWindow::BwCtrlWindow(QWidget *parent) +BwCtrlWindow::BwCtrlWindow(QWidget *parent) : RsAutoUpdatePage(1000,parent) { setupUi(this); BWDelegate = new BWListDelegate(); bwTreeWidget->setItemDelegate(BWDelegate); - + //float FS = QFontMetricsF(font()).height(); //float fact = FS/14.0 ; @@ -202,7 +202,7 @@ BwCtrlWindow::~BwCtrlWindow() void BwCtrlWindow::updateDisplay() { /* do nothing if locked, or not visible */ - if (RsAutoUpdatePage::eventsLocked() == true) + if (RsAutoUpdatePage::eventsLocked() == true) { #ifdef DEBUG_BWCTRLWINDOW std::cerr << "BwCtrlWindow::update() events Are Locked" << std::endl; @@ -238,7 +238,7 @@ void BwCtrlWindow::updateBandwidth() QTreeWidgetItem *item = new QTreeWidgetItem(); peerTreeWidget->addTopLevelItem(item); peerTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection); - + /* do Totals */ item -> setData(COLUMN_PEERID, Qt::DisplayRole, tr("TOTALS")); item -> setData(COLUMN_RSNAME, Qt::DisplayRole, tr("Totals")); @@ -311,18 +311,18 @@ void BwCtrlWindow::updateBandwidth() if (it->second.mAllowedTs != 0) { if (it->second.mAllowedOut < it->second.mRateOut) - { + { /* RED */ QColor bc("#ff4444"); // red peer_item -> setBackground(COLUMN_OUT_RATE,QBrush(bc)); - + } else if (it->second.mAllowedOut < it->second.mRateMaxOut) { /* YELLOW */ QColor bc("#ffff66"); // yellow peer_item -> setBackground(COLUMN_OUT_MAX,QBrush(bc)); - + } else { @@ -346,11 +346,11 @@ void BwCtrlWindow::updateBandwidth() #define QUEUE_YELLOW 500 if (it->second.mQueueOut > QUEUE_RED) - { + { /* RED */ QColor bc("#ff4444"); // red peer_item -> setBackground(COLUMN_OUT_QUEUE,QBrush(bc)); - + } else if (it->second.mQueueOut > QUEUE_ORANGE) { diff --git a/retroshare-gui/src/gui/statistics/BwCtrlWindow.h b/retroshare-gui/src/gui/statistics/BwCtrlWindow.h index 4126eb6bc..be0ccc367 100644 --- a/retroshare-gui/src/gui/statistics/BwCtrlWindow.h +++ b/retroshare-gui/src/gui/statistics/BwCtrlWindow.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/BwCtrlWindow.h * + * retroshare-gui/src/gui/statistics/BwCtrlWindow.h * * * * Copyright (c) 2012 Robert Fernie * * * diff --git a/retroshare-gui/src/gui/statistics/DhtWindow.cpp b/retroshare-gui/src/gui/statistics/DhtWindow.cpp index 52d6b928f..be84bbd47 100644 --- a/retroshare-gui/src/gui/statistics/DhtWindow.cpp +++ b/retroshare-gui/src/gui/statistics/DhtWindow.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/DhtWindow.cpp * + * retroshare-gui/src/gui/statistics/DhtWindow.cpp * * * * Copyright (c) 2011 Robert Fernie * * * @@ -49,11 +49,11 @@ DhtWindow::DhtWindow(QWidget *parent) : RsAutoUpdatePage(1000,parent) { ui.setupUi(this); - + connect( ui.filterLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterItems(QString))); connect( ui.filterLineEdit, SIGNAL(filterChanged(int)), this, SLOT(filterColumnChanged(int))); connect( ui.dhtTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(DHTCustomPopupMenu(QPoint))); - + /* add filter actions */ ui.filterLineEdit->addFilter(QIcon(), tr("IP"), DTW_COL_IPADDR, tr("Search IP")); ui.filterLineEdit->setCurrentFilter(DTW_COL_IPADDR); @@ -67,10 +67,10 @@ DhtWindow::~DhtWindow() void DhtWindow::DHTCustomPopupMenu( QPoint ) { QMenu contextMnu( this ); - + QTreeWidgetItem *item = ui.dhtTreeWidget->currentItem(); if (item) { - + QString Ip = item->text(DTW_COL_IPADDR); contextMnu.addAction(QIcon(), tr("Copy %1 to clipboard").arg(Ip), this, SLOT(copyIP())); @@ -83,7 +83,7 @@ void DhtWindow::DHTCustomPopupMenu( QPoint ) void DhtWindow::updateDisplay() { /* do nothing if locked, or not visible */ - if (RsAutoUpdatePage::eventsLocked() == true) + if (RsAutoUpdatePage::eventsLocked() == true) { #ifdef DEBUG_DHTWINDOW std::cerr << "DhtWindow::update() events Are Locked" << std::endl; @@ -307,20 +307,20 @@ void DhtWindow::updateNetPeers() #define PTW_COL_RSNAME 0 #define PTW_COL_PEERID 1 #define PTW_COL_DHT_STATUS 2 - + #define PTW_COL_PEER_CONNECTLOGIC 3 #define PTW_COL_PEER_CONNECT_STATUS 4 #define PTW_COL_PEER_CONNECT_MODE 5 #define PTW_COL_PEER_REQ_STATUS 6 - + #define PTW_COL_PEER_CB_MSG 7 #define PTW_COL_RSID 8 #if 0 /* clear old entries */ int itemCount = peerTreeWidget->topLevelItemCount(); - for (int nIndex = 0; nIndex < itemCount;) + for (int nIndex = 0; nIndex < itemCount;) { QTreeWidgetItem *tmp_item = ui.peerTreeWidget->topLevelItem(nIndex); std::string tmpid = tmp_item->data(PTW_COL_PEERID, Qt::DisplayRole).toString().toStdString(); @@ -348,7 +348,7 @@ void DhtWindow::updateNetPeers() for (int nIndex = 0; nIndex < itemCount; ++nIndex) { QTreeWidgetItem *tmp_item = ui.peerTreeWidget->topLevelItem(nIndex); - if (tmp_item->data(PTW_COL_PEERID, Qt::DisplayRole).toString() == qpeerid) + if (tmp_item->data(PTW_COL_PEERID, Qt::DisplayRole).toString() == qpeerid) { peer_item = tmp_item; break; @@ -362,11 +362,11 @@ void DhtWindow::updateNetPeers() peer_item = new QTreeWidgetItem(); ui.peerTreeWidget->addTopLevelItem(peer_item); } - + /* Set header resize modes and initial section sizes Peer TreeView*/ QHeaderView * _header = ui.peerTreeWidget->header () ; _header->resizeSection ( PTW_COL_RSNAME, 170 ); - + /* update the data */ RsDhtNetPeer status; rsDht->getNetPeerStatus(*it, status); @@ -403,7 +403,7 @@ void DhtWindow::updateNetPeers() ++nOnlinePeers; break; } - + peer_item -> setData(PTW_COL_DHT_STATUS, Qt::DisplayRole, dhtstate); // NOW CONNECT STATE @@ -459,16 +459,16 @@ void DhtWindow::updateNetPeers() } peer_item -> setData(PTW_COL_PEER_CONNECT_STATUS, Qt::DisplayRole, cpsstr); - + if (status.mPeerConnectState == RsDhtPeerConnectState::DISCONNECTED) { peer_item -> setData(PTW_COL_PEER_CONNECT_MODE, Qt::DisplayRole, ""); } - else + else { peer_item -> setData(PTW_COL_PEER_CONNECT_MODE, Qt::DisplayRole, cpmstr); } - + // NOW REQ STATE. QString reqstr; if (status.mExclusiveProxyLock) @@ -490,7 +490,7 @@ void DhtWindow::updateNetPeers() peer_item -> setData(PTW_COL_PEER_REQ_STATUS, Qt::DisplayRole, reqstr); peer_item -> setData(PTW_COL_PEER_CB_MSG, Qt::DisplayRole, QString::fromStdString(status.mCbPeerMsg)); - peer_item -> setData(PTW_COL_PEER_CONNECTLOGIC, Qt::DisplayRole, + peer_item -> setData(PTW_COL_PEER_CONNECTLOGIC, Qt::DisplayRole, QString::fromStdString(status.mConnectState)); } @@ -505,17 +505,17 @@ void DhtWindow::updateNetPeers() connstr += tr(",#proxy:") + QString::number(nProxyPeers); connstr += tr(",#relay:") + QString::number(nRelayPeers); connstr += ")";*/ - + ui.label_peers->setText(QString::number(nPeers)); - ui.label_offline->setText(QString::number(nOfflinePeers)); - ui.label_unreachable->setText(QString::number(nUnreachablePeers)); - ui.label_online->setText(QString::number(nOnlinePeers)); - + ui.label_offline->setText(QString::number(nOfflinePeers)); + ui.label_unreachable->setText(QString::number(nUnreachablePeers)); + ui.label_online->setText(QString::number(nOnlinePeers)); + ui.label_disconnected->setText(QString::number(nDisconnPeers)); - ui.label_direct->setText(QString::number(nDirectPeers)); - ui.label_proxy->setText(QString::number(nProxyPeers)); - ui.label_relay->setText(QString::number(nRelayPeers)); - + ui.label_direct->setText(QString::number(nDirectPeers)); + ui.label_proxy->setText(QString::number(nProxyPeers)); + ui.label_relay->setText(QString::number(nRelayPeers)); + ui.tabWidget_2->setTabText(1, tr("Peers") + " (" + QString::number(ui.peerTreeWidget->topLevelItemCount()) + ")" ); @@ -607,7 +607,7 @@ void DhtWindow::updateRelays() item -> setData(RTW_COL_BANDWIDTH, Qt::DisplayRole, bandwidthstr); } - + ui.tabWidget_2->setTabText(2, tr("Relays") + " (" + QString::number(ui.relayTreeWidget->topLevelItemCount()) + ")" ); } @@ -642,7 +642,7 @@ void DhtWindow::updateDhtPeers() /* Hackish display of all Dht peers, should be split into buckets (as children) */ //QString status = QString::fromStdString(mPeerNet->getDhtStatusString()); //dhtLabel->setText(status); - + std::list allpeers; std::list::iterator it; int i; @@ -698,14 +698,14 @@ void DhtWindow::updateDhtPeers() dht_item -> setData(DTW_COL_RECV, Qt::DisplayRole, lastrecvstr); ui.dhtTreeWidget->addTopLevelItem(dht_item); - + if (ui.filterLineEdit->text().isEmpty() == false) { filterItems(ui.filterLineEdit->text()); } - + ui.tabWidget_2->setTabText(0, tr("DHT") + " (" + QString::number(ui.dhtTreeWidget->topLevelItemCount()) + ")" ); } - + } diff --git a/retroshare-gui/src/gui/statistics/DhtWindow.h b/retroshare-gui/src/gui/statistics/DhtWindow.h index 795a80a36..c502b02a0 100644 --- a/retroshare-gui/src/gui/statistics/DhtWindow.h +++ b/retroshare-gui/src/gui/statistics/DhtWindow.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/DhtWindow.h * + * retroshare-gui/src/gui/statistics/DhtWindow.h * * * * Copyright (c) 2011 Robert Fernie * * * @@ -40,15 +40,15 @@ public: public slots: virtual void updateDisplay() ; - + void filterColumnChanged(int); void filterItems(const QString &text); - + private slots: /** Create the context popup menu and it's submenus */ void DHTCustomPopupMenu( QPoint point ); void copyIP(); - + protected: //void changeEvent(QEvent *e); diff --git a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp index f0019e9ad..75166a701 100644 --- a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp +++ b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/GlobalRouterStatistics.cpp * + * retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp * * * * Copyright (c) 2011 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.h b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.h index c8e49fb4a..2c00d1fe8 100644 --- a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.h +++ b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/GlobalRouterStatistics.h * + * retroshare-gui/src/gui/statistics/GlobalRouterStatistics.h * * * * Copyright (c) 2011 Retroshare Team * * * @@ -37,19 +37,19 @@ class GlobalRouterStatistics: public RsAutoUpdatePage, public Ui::GlobalRouterSt public: GlobalRouterStatistics(QWidget *parent = NULL) ; ~GlobalRouterStatistics(); - + // Cache for peer names. static QString getPeerName(const RsPeerId& peer_id) ; - + void updateContent() ; - + private slots: /** Create the context popup menu and it's submenus */ void CustomPopupMenu( QPoint point ); void personDetails(); - + private: - + void processSettings(bool bLoad); bool m_bProcessSettings; diff --git a/retroshare-gui/src/gui/statistics/GxsIdStatistics.cpp b/retroshare-gui/src/gui/statistics/GxsIdStatistics.cpp index 8a877a131..c9555c640 100644 --- a/retroshare-gui/src/gui/statistics/GxsIdStatistics.cpp +++ b/retroshare-gui/src/gui/statistics/GxsIdStatistics.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/GlobalRouterStatistics.cpp * + * retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp * * * * Copyright (c) 2011 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statistics/GxsIdStatistics.h b/retroshare-gui/src/gui/statistics/GxsIdStatistics.h index fc0ab93fd..bfb75257e 100644 --- a/retroshare-gui/src/gui/statistics/GxsIdStatistics.h +++ b/retroshare-gui/src/gui/statistics/GxsIdStatistics.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/GxsIdStatistics.h * + * retroshare-gui/src/gui/statistics/GxsIdStatistics.h * * * * Copyright (c) 2011 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp index a6c729862..8b3c5799a 100644 --- a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp +++ b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/GxsTransportStatistics.cpp * + * retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp * * * * Copyright (c) 2011 Retroshare Team * * * @@ -89,7 +89,7 @@ GxsTransportStatistics::GxsTransportStatistics(QWidget *parent) : MainPage(parent) { setupUi(this) ; - + mStateHelper = new UIStateHelper(this); mStateHelper->addWidget(GXSTRANS_GROUP_META, treeWidget); @@ -138,14 +138,14 @@ void GxsTransportStatistics::processSettings(bool bLoad) } Settings->endGroup(); - + m_bProcessSettings = false; } void GxsTransportStatistics::CustomPopupMenu( QPoint ) { QMenu contextMnu( this ); - + QTreeWidgetItem *item = treeWidget->currentItem(); if (item) { contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/images/info16.png"), tr("View details"), this, SLOT(personDetails())); @@ -158,7 +158,7 @@ void GxsTransportStatistics::CustomPopupMenu( QPoint ) void GxsTransportStatistics::CustomPopupMenuGroups( QPoint ) { QMenu contextMnu( this ); - + QTreeWidgetItem *item = groupTreeWidget->currentItem(); if (item) { contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/images/info16.png"), tr("View details"), this, SLOT(showAuthorInPeople())); @@ -229,9 +229,9 @@ void GxsTransportStatistics::updateContent() treeWidget->clear(); //time_t now = time(NULL) ; - + // 1 - fill the table for pending packets - + time_t now = time(NULL) ; groupBox->setTitle(tr("Pending data items")+": " + QString::number(transinfo.outgoing_records.size()) ); @@ -243,11 +243,11 @@ void GxsTransportStatistics::updateContent() //QTreeWidgetItem *item = new QTreeWidgetItem(); GxsIdRSTreeWidgetItem *item = new GxsIdRSTreeWidgetItem(NULL,GxsIdDetails::ICON_TYPE_AVATAR) ; treeWidget->addTopLevelItem(item); - + RsIdentityDetails details ; rsIdentity->getIdDetails(rec.recipient,details); QString nickname = QString::fromUtf8(details.mNickname.c_str()); - + if(nickname.isEmpty()) nickname = tr("Unknown"); @@ -326,16 +326,16 @@ void GxsTransportStatistics::updateContent() GxsIdLabel *label = new GxsIdLabel(); label->setId(meta.mAuthorId) ; groupTreeWidget->setItemWidget(sitem,COL_GROUP_GRP_ID,label) ; - + RsIdentityDetails idDetails ; rsIdentity->getIdDetails(meta.mAuthorId,idDetails); - + QPixmap pixmap ; QDateTime qdatetime = DateTime::DateTimeFromTime_t(meta.mPublishTs); if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) pixmap = GxsIdDetails::makeDefaultIcon(meta.mAuthorId,GxsIdDetails::SMALL); - + sitem->setIcon(COL_GROUP_GRP_ID, QIcon(pixmap)); sitem->setData(COL_GROUP_UNIQUE_ID, Qt::DisplayRole,QString::fromStdString(meta.mMsgId.toStdString())); @@ -354,7 +354,7 @@ void GxsTransportStatistics::personDetails() if (id.empty()) { return; } - + IdDetailsDialog *dialog = new IdDetailsDialog(RsGxsGroupId(id)); dialog->show(); } diff --git a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.h b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.h index 0b9970c1c..56d5881a6 100644 --- a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.h +++ b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/GxsTransportStatistics.h * + * retroshare-gui/src/gui/statistics/GxsTransportStatistics.h * * * * Copyright (c) 2011 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statistics/Histogram.cpp b/retroshare-gui/src/gui/statistics/Histogram.cpp index 77e272b31..38dff5da3 100644 --- a/retroshare-gui/src/gui/statistics/Histogram.cpp +++ b/retroshare-gui/src/gui/statistics/Histogram.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/Histogram.cpp * + * retroshare-gui/src/gui/statistics/Histogram.cpp * * * * Copyright (c) 2020 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statistics/Histogram.h b/retroshare-gui/src/gui/statistics/Histogram.h index 3931b15db..6529e78e0 100644 --- a/retroshare-gui/src/gui/statistics/Histogram.h +++ b/retroshare-gui/src/gui/statistics/Histogram.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/Histogram.h * + * retroshare-gui/src/gui/statistics/Histogram.h * * * * Copyright (c) 2020 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statistics/RttStatistics.h b/retroshare-gui/src/gui/statistics/RttStatistics.h index 32c8b4f1b..a2a8acf38 100644 --- a/retroshare-gui/src/gui/statistics/RttStatistics.h +++ b/retroshare-gui/src/gui/statistics/RttStatistics.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/RttStatistics.h * + * retroshare-gui/src/gui/statistics/RttStatistics.h * * * * Copyright (c) 2011 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp b/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp index 684fdc69d..c8995945c 100644 --- a/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp +++ b/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/StatisticsWindow.cpp * + * retroshare-gui/src/gui/statistics/StatisticsWindow.cpp * * * * Copyright (c) 2011 Robert Fernier * * * @@ -98,9 +98,9 @@ StatisticsWindow::StatisticsWindow(QWidget *parent) : ui(new Ui::StatisticsWindow) { ui->setupUi(this); - + Settings->loadWidgetInformation(this); - + initStackedPage(); connect(ui->stackPages, SIGNAL(currentChanged(int)), this, SLOT(setNewPage(int))); ui->stackPages->setCurrentIndex(0); @@ -142,25 +142,25 @@ void StatisticsWindow::initStackedPage() /* Create the Main pages and actions */ QActionGroup *grp = new QActionGroup(this); QAction *action; - + ui->stackPages->add(bwdlg = new BwCtrlWindow(ui->stackPages), action = createPageAction(FilesDefs::getIconFromQtResourcePath(IMAGE_BWGRAPH), tr("Bandwidth"), grp)); - + ui->stackPages->add(trsdlg = new TurtleRouterStatistics(ui->stackPages), action = createPageAction(FilesDefs::getIconFromQtResourcePath(IMAGE_TURTLE), tr("Turtle Router"), grp)); - + ui->stackPages->add(gxsiddlg = new GxsIdStatistics(ui->stackPages), action = createPageAction(FilesDefs::getIconFromQtResourcePath(IMAGE_IDENTITIES), tr("Identities"), grp)); ui->stackPages->add(grsdlg = new GlobalRouterStatistics(ui->stackPages), action = createPageAction(FilesDefs::getIconFromQtResourcePath(IMAGE_GLOBALROUTER), tr("Global Router"), grp)); - + ui->stackPages->add(gxsdlg = new GxsTransportStatistics(ui->stackPages), action = createPageAction(FilesDefs::getIconFromQtResourcePath(IMAGE_GXSTRANSPORT), tr("Gxs Transport"), grp)); ui->stackPages->add(rttdlg = new RttStatistics(ui->stackPages), action = createPageAction(FilesDefs::getIconFromQtResourcePath(IMAGE_RTT), tr("RTT Statistics"), grp)); - + bool showdht = true; RsPeerDetails detail; if (rsPeers->getPeerDetails(rsPeers->getOwnId(), detail)) @@ -173,7 +173,7 @@ void StatisticsWindow::initStackedPage() ui->stackPages->add(dhtw = new DhtWindow(ui->stackPages), action = createPageAction(FilesDefs::getIconFromQtResourcePath(IMAGE_DHT), tr("DHT"), grp)); } - + /*std::cerr << "Looking for interfaces in existing plugins:" << std::endl; for(int i = 0;inbPlugins();++i) { @@ -197,7 +197,7 @@ void StatisticsWindow::initStackedPage() else std::cerr << " No plugin page !" << std::endl; - } */ + } */ /* Create the toolbar */ ui->toolBar->addActions(grp->actions()); diff --git a/retroshare-gui/src/gui/statistics/StatisticsWindow.h b/retroshare-gui/src/gui/statistics/StatisticsWindow.h index 2450812d7..a40fda902 100644 --- a/retroshare-gui/src/gui/statistics/StatisticsWindow.h +++ b/retroshare-gui/src/gui/statistics/StatisticsWindow.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/StatisticsWindow.h * + * retroshare-gui/src/gui/statistics/StatisticsWindow.h * * * * Copyright (c) 2011 Robert Fernier * * * @@ -63,20 +63,20 @@ public: public slots: void setNewPage(int page); - + protected: void changeEvent(QEvent *e); void closeEvent (QCloseEvent * event); - + private: void initStackedPage(); - + Ui::StatisticsWindow *ui; static StatisticsWindow *mInstance; - + /** Creates a new action for a Main page. */ - QAction* createPageAction(const QIcon &icon, const QString &text, QActionGroup *group); + QAction* createPageAction(const QIcon &icon, const QString &text, QActionGroup *group); }; diff --git a/retroshare-gui/src/gui/statistics/TurtleRouterDialog.cpp b/retroshare-gui/src/gui/statistics/TurtleRouterDialog.cpp index 05759c3e1..426358c0e 100644 --- a/retroshare-gui/src/gui/statistics/TurtleRouterDialog.cpp +++ b/retroshare-gui/src/gui/statistics/TurtleRouterDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/TurtleRouterDialog.cpp * + * retroshare-gui/src/gui/statistics/TurtleRouterDialog.cpp * * * * Copyright (c) 2011 Retroshare Team * * * @@ -41,7 +41,7 @@ TurtleRouterDialog::TurtleRouterDialog(QWidget *parent) : RsAutoUpdatePage(2000,parent) { setupUi(this) ; - + m_bProcessSettings = false; // Init the basic setup. @@ -91,7 +91,7 @@ void TurtleRouterDialog::processSettings(bool bLoad) } Settings->endGroup(); - + m_bProcessSettings = false; } @@ -106,9 +106,9 @@ void TurtleRouterDialog::updateDisplay() std::vector tunnel_reqs_info ; rsTurtle->getInfo(hashes_info,tunnels_info,search_reqs_info,tunnel_reqs_info) ; - + std::sort(search_reqs_info.begin(),search_reqs_info.end(),sr_Compare) ; - + updateTunnelRequests(hashes_info,tunnels_info,search_reqs_info,tunnel_reqs_info) ; } @@ -131,8 +131,8 @@ QString TurtleRouterDialog::getPeerName(const RsPeerId& peer_id) } } -void TurtleRouterDialog::updateTunnelRequests( const std::vector >& hashes_info, - const std::vector >& tunnels_info, +void TurtleRouterDialog::updateTunnelRequests( const std::vector >& hashes_info, + const std::vector >& tunnels_info, const std::vector& search_reqs_info, const std::vector& tunnel_reqs_info) { @@ -144,7 +144,7 @@ void TurtleRouterDialog::updateTunnelRequests( const std::vectortopLevelItemCount();++i) { QTreeWidgetItem *taken ; - while( (taken = _f2f_TW->topLevelItem(i)->takeChild(0)) != NULL) + while( (taken = _f2f_TW->topLevelItem(i)->takeChild(0)) != NULL) delete taken ; } @@ -162,7 +162,7 @@ void TurtleRouterDialog::updateTunnelRequests( const std::vectortext(0).left(14) == tr("Unknown hashes")) unknown_hash_found = true ; - + float num = strtof(tunnels_info[i][5].c_str(), NULL); // printFloatNumber char tmp[100] ; std::string units[4] = { "B/s","KB/s","MB/s","GB/s" } ; @@ -192,7 +192,7 @@ void TurtleRouterDialog::updateTunnelRequests( const std::vectoraddChild(new QTreeWidgetItem(stl)) ; - } + } top_level_t_requests->setText(0, tr("Tunnel requests") + " ("+QString::number(tunnel_reqs_info.size()) + ")") ; @@ -235,7 +235,7 @@ void TurtleRouterDialog::updateTunnelRequests( const std::vectortopLevelItem(i)->text(0).toStdString() == hashes_info[j][0]) + if(_f2f_TW->topLevelItem(i)->text(0).toStdString() == hashes_info[j][0]) found=true ; if(!found) @@ -244,7 +244,7 @@ void TurtleRouterDialog::updateTunnelRequests( const std::vector items = _f2f_TW->findItems((hash==null_hash)?tr("Unknown hashes"):QString::fromStdString(hash),Qt::MatchStartsWith) ; if(items.empty()) - { + { QStringList stl ; stl.push_back((hash==null_hash)?tr("Unknown hashes"):QString::fromStdString(hash)) ; QTreeWidgetItem *item = new QTreeWidgetItem(_f2f_TW,stl) ; @@ -299,7 +299,7 @@ void TunnelStatisticsDialog::processSettings(bool bLoad) } Settings->endGroup(); - + m_bProcessSettings = false; } @@ -376,26 +376,26 @@ GxsAuthenticatedTunnelsDialog::GxsAuthenticatedTunnelsDialog(QWidget *parent) void GxsAuthenticatedTunnelsDialog::updateDisplay() { // Request info about ongoing tunnels - + std::vector tunnel_infos ; - + rsGxsTunnel->getTunnelsInfo(tunnel_infos) ; - + // // Tunnel information - // + // // GxsTunnelId tunnel_id ; // GXS Id we're talking to // RsGxsId destination_gxs_id ; // GXS Id we're talking to // RsGxsId source_gxs_id ; // GXS Id we're using to talk // uint32_t tunnel_status ; // active, requested, DH pending, etc. - // uint32_t total_size_sent ; // total bytes sent through that tunnel since openned (including management). - // uint32_t total_size_received ; // total bytes received through that tunnel since openned (including management). + // uint32_t total_size_sent ; // total bytes sent through that tunnel since openned (including management). + // uint32_t total_size_received ; // total bytes received through that tunnel since openned (including management). // // Data packets // uint32_t pending_data_packets; // number of packets not acknowledged by other side, still on their way. Should be 0 unless something bad happens. // uint32_t total_data_packets_sent ; // total number of data packets sent (does not include tunnel management) // uint32_t total_data_packets_received ; // total number of data packets received (does not include tunnel management) - + // now draw the shit QPixmap tmppixmap(maxWidth, maxHeight); tmppixmap.fill(Qt::transparent); @@ -416,7 +416,7 @@ void GxsAuthenticatedTunnelsDialog::updateDisplay() painter.setPen(QColor::fromRgb(0,0,0)) ; painter.drawText(ox+2*cellx,oy+celly,tr("Authenticated tunnels:")) ; oy += celly ; - + for(uint32_t i=0;i * * * @@ -36,16 +36,16 @@ class TurtleRouterDialog: public RsAutoUpdatePage, public Ui::TurtleRouterDialog public: TurtleRouterDialog(QWidget *parent = NULL) ; ~TurtleRouterDialog(); - + // Cache for peer names. static QString getPeerName(const RsPeerId &peer_id) ; private: - void updateTunnelRequests( const std::vector > >&, - const std::vector > >&, + void updateTunnelRequests( const std::vector > >&, + const std::vector > >&, const std::vector&, const std::vector&) ; - + void processSettings(bool bLoad); bool m_bProcessSettings; diff --git a/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.cpp b/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.cpp index 3b45e753d..29b99a64a 100644 --- a/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.cpp +++ b/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/TurtleRouterStatistics.cpp * + * retroshare-gui/src/gui/statistics/TurtleRouterStatistics.cpp * * * * Copyright (c) 2011 Retroshare Team * * * @@ -183,17 +183,17 @@ TurtleRouterStatistics::TurtleRouterStatistics(QWidget *parent) : RsAutoUpdatePage(2000,parent) { setupUi(this) ; - + m_bProcessSettings = false; - _tunnel_statistics_F->setWidget( _tst_CW = new TurtleRouterStatisticsWidget() ) ; + _tunnel_statistics_F->setWidget( _tst_CW = new TurtleRouterStatisticsWidget() ) ; _tunnel_statistics_F->setWidgetResizable(true); _tunnel_statistics_F->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); _tunnel_statistics_F->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); _tunnel_statistics_F->viewport()->setBackgroundRole(QPalette::NoRole); _tunnel_statistics_F->setFrameStyle(QFrame::NoFrame); _tunnel_statistics_F->setFocusPolicy(Qt::NoFocus); - + routertabWidget->addTab(new TurtleRouterDialog(), QString(tr("File transfer tunnels"))); routertabWidget->addTab(new GxsAuthenticatedTunnelsDialog(),QString(tr("Authenticated tunnels"))); routertabWidget->addTab(new GxsNetTunnelsDialog(), QString(tr("GXS sync tunnels") )); @@ -241,7 +241,7 @@ void TurtleRouterStatistics::processSettings(bool bLoad) } Settings->endGroup(); - + m_bProcessSettings = false; } @@ -341,7 +341,7 @@ void TurtleRouterStatisticsWidget::updateTunnelStatistics(const std::vector * * * @@ -61,8 +61,8 @@ class TurtleRouterStatisticsWidget: public QWidget virtual void paintEvent(QPaintEvent *event) ; virtual void resizeEvent(QResizeEvent *event); - void updateTunnelStatistics( const std::vector > >&, - const std::vector > >&, + void updateTunnelStatistics( const std::vector > >&, + const std::vector > >&, const std::vector&, const std::vector&) ; diff --git a/retroshare-gui/src/gui/statistics/dhtgraph.h b/retroshare-gui/src/gui/statistics/dhtgraph.h index b8baff3b0..d03beaf66 100644 --- a/retroshare-gui/src/gui/statistics/dhtgraph.h +++ b/retroshare-gui/src/gui/statistics/dhtgraph.h @@ -1,5 +1,5 @@ /******************************************************************************* - * retroshare-gui/src/statistics/dhtgraph.h * + * retroshare-gui/src/retroshare-gui/src/statistics/dhtgraph.h * * * * libretroshare: retroshare core library * * * @@ -75,7 +75,7 @@ class DhtGraph : public RSGraphWidget resetFlags(RSGRAPH_FLAGS_LOG_SCALE_Y) ; setFlags(RSGRAPH_FLAGS_PAINT_STYLE_PLAIN) ; - + int graphColor = Settings->valueFromGroup("BandwidthStatsWidget", "cmbGraphColor", 0).toInt(); if(graphColor==0) diff --git a/retroshare-gui/src/gui/statistics/turtlegraph.h b/retroshare-gui/src/gui/statistics/turtlegraph.h index 6b6da78e9..8d2404210 100644 --- a/retroshare-gui/src/gui/statistics/turtlegraph.h +++ b/retroshare-gui/src/gui/statistics/turtlegraph.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statistics/turtlegraph.h * + * retroshare-gui/src/gui/statistics/turtlegraph.h * * * * Copyright (c) 2011 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/OpModeStatus.cpp b/retroshare-gui/src/gui/statusbar/OpModeStatus.cpp index 994974342..5d9f2d733 100644 --- a/retroshare-gui/src/gui/statusbar/OpModeStatus.cpp +++ b/retroshare-gui/src/gui/statusbar/OpModeStatus.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/OpModeStatus.cpp * + * retroshare-gui/src/gui/statusbar/OpModeStatus.cpp * * * * Copyright (c) 2008 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/OpModeStatus.h b/retroshare-gui/src/gui/statusbar/OpModeStatus.h index 9ffe282a3..57c40f82d 100644 --- a/retroshare-gui/src/gui/statusbar/OpModeStatus.h +++ b/retroshare-gui/src/gui/statusbar/OpModeStatus.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/OpModeStatus.h * + * retroshare-gui/src/gui/statusbar/OpModeStatus.h * * * * Copyright (c) 2008 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/SoundStatus.cpp b/retroshare-gui/src/gui/statusbar/SoundStatus.cpp index e798142a0..73dc9d67b 100644 --- a/retroshare-gui/src/gui/statusbar/SoundStatus.cpp +++ b/retroshare-gui/src/gui/statusbar/SoundStatus.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/soundstatus.cpp * + * retroshare-gui/src/gui/statusbar/soundstatus.cpp * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/SoundStatus.h b/retroshare-gui/src/gui/statusbar/SoundStatus.h index 2290722e5..51efa3e0e 100644 --- a/retroshare-gui/src/gui/statusbar/SoundStatus.h +++ b/retroshare-gui/src/gui/statusbar/SoundStatus.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/soundstatus.h * + * retroshare-gui/src/gui/statusbar/soundstatus.h * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/SysTrayStatus.cpp b/retroshare-gui/src/gui/statusbar/SysTrayStatus.cpp index c4144d67c..8c721c2f2 100644 --- a/retroshare-gui/src/gui/statusbar/SysTrayStatus.cpp +++ b/retroshare-gui/src/gui/statusbar/SysTrayStatus.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/systraystatus.cpp * + * retroshare-gui/src/gui/statusbar/systraystatus.cpp * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/SysTrayStatus.h b/retroshare-gui/src/gui/statusbar/SysTrayStatus.h index baa688d6b..b160fb913 100644 --- a/retroshare-gui/src/gui/statusbar/SysTrayStatus.h +++ b/retroshare-gui/src/gui/statusbar/SysTrayStatus.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/systraystatus.h * + * retroshare-gui/src/gui/statusbar/systraystatus.h * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/ToasterDisable.cpp b/retroshare-gui/src/gui/statusbar/ToasterDisable.cpp index 2bfa458bd..f8988ba87 100644 --- a/retroshare-gui/src/gui/statusbar/ToasterDisable.cpp +++ b/retroshare-gui/src/gui/statusbar/ToasterDisable.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/ToasterDisable.cpp * + * retroshare-gui/src/gui/statusbar/ToasterDisable.cpp * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/ToasterDisable.h b/retroshare-gui/src/gui/statusbar/ToasterDisable.h index 8966a4992..d85bc794b 100644 --- a/retroshare-gui/src/gui/statusbar/ToasterDisable.h +++ b/retroshare-gui/src/gui/statusbar/ToasterDisable.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/ToasterDisable.h * + * retroshare-gui/src/gui/statusbar/ToasterDisable.h * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/dhtstatus.cpp b/retroshare-gui/src/gui/statusbar/dhtstatus.cpp index 40790e4d6..bd4429090 100644 --- a/retroshare-gui/src/gui/statusbar/dhtstatus.cpp +++ b/retroshare-gui/src/gui/statusbar/dhtstatus.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/dhtstatus.cpp * + * retroshare-gui/src/gui/statusbar/dhtstatus.cpp * * * * Copyright (c) 2009 Retroshare Team * * * @@ -39,17 +39,17 @@ DHTStatus::DHTStatus(QWidget *parent) QHBoxLayout *hbox = new QHBoxLayout(); hbox->setContentsMargins(0, 0, 0, 0); hbox->setSpacing(6); - + statusDHT = new QLabel("" + tr("DHT") + ":", this ); statusDHT->setToolTip(tr("

Retroshare uses Bittorrent's DHT as a proxy for connexions. It does not \"store\" your IP in the DHT. \ Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. \ The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.

")) ; hbox->addWidget(statusDHT); - + dhtstatusLabel = new QLabel( this ); dhtstatusLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_grey_128.png")); hbox->addWidget(dhtstatusLabel); - + spaceLabel = new QLabel( "|", this ); spaceLabel->setVisible(false); hbox->addWidget(spaceLabel); @@ -91,7 +91,7 @@ void DHTStatus::getDHTStatus() spaceLabel->setVisible(false); dhtnetworkLabel->setVisible(false); dhtnetworksizeLabel->setVisible(false); - + dhtnetworksizeLabel->setText(""); dhtnetworksizeLabel->setToolTip(""); } @@ -135,7 +135,7 @@ void DHTStatus::getDHTStatus() spaceLabel->setVisible(false); dhtnetworkLabel->setVisible(false); dhtnetworksizeLabel->setVisible(false); - + dhtnetworksizeLabel->setText(""); dhtnetworksizeLabel->setToolTip(""); } diff --git a/retroshare-gui/src/gui/statusbar/dhtstatus.h b/retroshare-gui/src/gui/statusbar/dhtstatus.h index c54264dcf..e8937edfd 100644 --- a/retroshare-gui/src/gui/statusbar/dhtstatus.h +++ b/retroshare-gui/src/gui/statusbar/dhtstatus.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/dhtstatus.h * + * retroshare-gui/src/gui/statusbar/dhtstatus.h * * * * Copyright (c) 2009 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/discstatus.cpp b/retroshare-gui/src/gui/statusbar/discstatus.cpp index 7475bf3a7..35845fca3 100644 --- a/retroshare-gui/src/gui/statusbar/discstatus.cpp +++ b/retroshare-gui/src/gui/statusbar/discstatus.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/discstatus.cpp * + * retroshare-gui/src/gui/statusbar/discstatus.cpp * * * * Copyright (c) 2008 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/discstatus.h b/retroshare-gui/src/gui/statusbar/discstatus.h index afbc18c7e..5fb887a55 100644 --- a/retroshare-gui/src/gui/statusbar/discstatus.h +++ b/retroshare-gui/src/gui/statusbar/discstatus.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/discstatus.h * + * retroshare-gui/src/gui/statusbar/discstatus.h * * * * Copyright (c) 2008 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/hashingstatus.cpp b/retroshare-gui/src/gui/statusbar/hashingstatus.cpp index fdbb5c4fa..2e10b31f7 100644 --- a/retroshare-gui/src/gui/statusbar/hashingstatus.cpp +++ b/retroshare-gui/src/gui/statusbar/hashingstatus.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/hashingstatus.cpp * + * retroshare-gui/src/gui/statusbar/hashingstatus.cpp * * * * Copyright (c) 2008 Retroshare Team * * * @@ -38,7 +38,7 @@ HashingStatus::HashingStatus(QWidget *parent) QHBoxLayout *hbox = new QHBoxLayout(this); hbox->setContentsMargins(0, 0, 0, 0); hbox->setSpacing(6); - + movie = new QMovie(":/images/loader/indicator-16.gif"); movie->setSpeed(80); // 2x speed hashloader = new QLabel(this); diff --git a/retroshare-gui/src/gui/statusbar/hashingstatus.h b/retroshare-gui/src/gui/statusbar/hashingstatus.h index 180206088..696844d8c 100644 --- a/retroshare-gui/src/gui/statusbar/hashingstatus.h +++ b/retroshare-gui/src/gui/statusbar/hashingstatus.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/hashingstatus.h * + * retroshare-gui/src/gui/statusbar/hashingstatus.h * * * * Copyright (c) 2008 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/natstatus.cpp b/retroshare-gui/src/gui/statusbar/natstatus.cpp index 28ae53c35..771bd84a1 100644 --- a/retroshare-gui/src/gui/statusbar/natstatus.cpp +++ b/retroshare-gui/src/gui/statusbar/natstatus.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/natstatus.cpp * + * retroshare-gui/src/gui/statusbar/natstatus.cpp * * * * Copyright (c) 2009 Retroshare Team * * * @@ -33,11 +33,11 @@ NATStatus::NATStatus(QWidget *parent) QHBoxLayout *hbox = new QHBoxLayout(this); hbox->setContentsMargins(0, 0, 0, 0); hbox->setSpacing(6); - + statusNAT = new QLabel( tr("NAT:"), this ); // statusDHT->setMinimumSize( statusPeers->frameSize().width() + 0, 0 ); hbox->addWidget(statusNAT); - + iconLabel = new QLabel(this); iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/grayled.png")); // iconLabel doesn't change over time, so we didn't need a minimum size diff --git a/retroshare-gui/src/gui/statusbar/natstatus.h b/retroshare-gui/src/gui/statusbar/natstatus.h index e3572fc49..475e7e53e 100644 --- a/retroshare-gui/src/gui/statusbar/natstatus.h +++ b/retroshare-gui/src/gui/statusbar/natstatus.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/natstatus.h * + * retroshare-gui/src/gui/statusbar/natstatus.h * * * * Copyright (c) 2009 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/peerstatus.cpp b/retroshare-gui/src/gui/statusbar/peerstatus.cpp index 5cfce309f..fd19dd8c8 100644 --- a/retroshare-gui/src/gui/statusbar/peerstatus.cpp +++ b/retroshare-gui/src/gui/statusbar/peerstatus.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/peerstatus.cpp * + * retroshare-gui/src/gui/statusbar/peerstatus.cpp * * * * Copyright (c) 2008 Retroshare Team * * * @@ -30,13 +30,13 @@ PeerStatus::PeerStatus(QWidget *parent) QHBoxLayout *hbox = new QHBoxLayout(this); hbox->setContentsMargins(0, 0, 0, 0); hbox->setSpacing(6); - + iconLabel = new QLabel( this ); int S = QFontMetricsF(iconLabel->font()).height(); iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/avatar_grey_128.png").scaledToHeight(S,Qt::SmoothTransformation)); hbox->addWidget(iconLabel); - + statusPeers = new QLabel( tr("Friends: 0/0"), this ); hbox->addWidget(statusPeers); diff --git a/retroshare-gui/src/gui/statusbar/peerstatus.h b/retroshare-gui/src/gui/statusbar/peerstatus.h index 1642e24e2..e84b904a2 100644 --- a/retroshare-gui/src/gui/statusbar/peerstatus.h +++ b/retroshare-gui/src/gui/statusbar/peerstatus.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/peerstatus.h * + * retroshare-gui/src/gui/statusbar/peerstatus.h * * * * Copyright (c) 2008 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/ratesstatus.cpp b/retroshare-gui/src/gui/statusbar/ratesstatus.cpp index b953020fa..33f86c391 100644 --- a/retroshare-gui/src/gui/statusbar/ratesstatus.cpp +++ b/retroshare-gui/src/gui/statusbar/ratesstatus.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/ratestatus.cpp * + * retroshare-gui/src/gui/statusbar/ratestatus.cpp * * * * Copyright (c) 2008 Retroshare Team * * * @@ -34,12 +34,12 @@ RatesStatus::RatesStatus(QWidget *parent) QHBoxLayout *hbox = new QHBoxLayout(this); hbox->setContentsMargins(0, 0, 0, 0); hbox->setSpacing(6); - + iconLabel = new QLabel( this ); iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/up0down0.png")); // iconLabel doesn't change over time, so we didn't need a minimum size hbox->addWidget(iconLabel); - + statusRates = new QLabel( tr("Down: 0.00 (kB/s) | Up: 0.00 (kB/s)")+" ", this ); // statusPeers->setMinimumSize( statusPeers->frameSize().width() + 0, 0 ); hbox->addWidget(statusRates); diff --git a/retroshare-gui/src/gui/statusbar/ratesstatus.h b/retroshare-gui/src/gui/statusbar/ratesstatus.h index 063bc030a..bc35adbcd 100644 --- a/retroshare-gui/src/gui/statusbar/ratesstatus.h +++ b/retroshare-gui/src/gui/statusbar/ratesstatus.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/ratestatus.h * + * retroshare-gui/src/gui/statusbar/ratestatus.h * * * * Copyright (c) 2008 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/statusbar/torstatus.cpp b/retroshare-gui/src/gui/statusbar/torstatus.cpp index 12bcddf54..2fb828017 100644 --- a/retroshare-gui/src/gui/statusbar/torstatus.cpp +++ b/retroshare-gui/src/gui/statusbar/torstatus.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/torstatus.cpp * + * retroshare-gui/src/gui/statusbar/torstatus.cpp * * * * Copyright (c) 2012 Retroshare Team * * * @@ -42,15 +42,15 @@ TorStatus::TorStatus(QWidget *parent) QHBoxLayout *hbox = new QHBoxLayout(); hbox->setContentsMargins(0, 0, 0, 0); hbox->setSpacing(6); - + statusTor = new QLabel("" + tr("Tor") + ":", this ); statusTor->setToolTip(tr("

This version of Retroshare uses Tor to connect to your trusted nodes.

")) ; hbox->addWidget(statusTor); - + torstatusLabel = new QLabel( this ); torstatusLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/no-tor.png")); hbox->addWidget(torstatusLabel); - + _compactMode = false; _updated = false; diff --git a/retroshare-gui/src/gui/statusbar/torstatus.h b/retroshare-gui/src/gui/statusbar/torstatus.h index 79314b142..1e9804242 100644 --- a/retroshare-gui/src/gui/statusbar/torstatus.h +++ b/retroshare-gui/src/gui/statusbar/torstatus.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/statusbar/torstatus.h * + * retroshare-gui/src/gui/statusbar/torstatus.h * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/style/RSStyle.cpp b/retroshare-gui/src/gui/style/RSStyle.cpp index e01464a8f..4a188a422 100644 --- a/retroshare-gui/src/gui/style/RSStyle.cpp +++ b/retroshare-gui/src/gui/style/RSStyle.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/style/RSStyle.cpp * + * retroshare-gui/src/gui/style/RSStyle.cpp * * * * Copyright (c) 2010 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/style/RSStyle.h b/retroshare-gui/src/gui/style/RSStyle.h index 0c804a43e..e4ffa927a 100644 --- a/retroshare-gui/src/gui/style/RSStyle.h +++ b/retroshare-gui/src/gui/style/RSStyle.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/style/RSStyle.h * + * retroshare-gui/src/gui/style/RSStyle.h * * * * Copyright (c) 2010 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/style/StyleDialog.cpp b/retroshare-gui/src/gui/style/StyleDialog.cpp index 7d7d5c1b7..47ad9ec0d 100644 --- a/retroshare-gui/src/gui/style/StyleDialog.cpp +++ b/retroshare-gui/src/gui/style/StyleDialog.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/style/StyleDialog.cpp * + * retroshare-gui/src/gui/style/StyleDialog.cpp * * * * Copyright (c) 2006 Crypton * * * diff --git a/retroshare-gui/src/gui/style/StyleDialog.h b/retroshare-gui/src/gui/style/StyleDialog.h index 6454130cb..d51d173b2 100644 --- a/retroshare-gui/src/gui/style/StyleDialog.h +++ b/retroshare-gui/src/gui/style/StyleDialog.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/style/StyleDialog.h * + * retroshare-gui/src/gui/style/StyleDialog.h * * * * Copyright (c) 2006 Crypton * * * diff --git a/retroshare-gui/src/gui/toaster/ChatLobbyToaster.cpp b/retroshare-gui/src/gui/toaster/ChatLobbyToaster.cpp index ae61c7b3b..3e6ce1749 100644 --- a/retroshare-gui/src/gui/toaster/ChatLobbyToaster.cpp +++ b/retroshare-gui/src/gui/toaster/ChatLobbyToaster.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/ChatLobbyToaster.cpp * + * retroshare-gui/src/gui/toaster/ChatLobbyToaster.cpp * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/toaster/ChatLobbyToaster.h b/retroshare-gui/src/gui/toaster/ChatLobbyToaster.h index e507554da..482c0e561 100644 --- a/retroshare-gui/src/gui/toaster/ChatLobbyToaster.h +++ b/retroshare-gui/src/gui/toaster/ChatLobbyToaster.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/ChatLobbyToaster.h * + * retroshare-gui/src/gui/toaster/ChatLobbyToaster.h * * * * Copyright (c) 2012 Retroshare Team * * * @@ -28,7 +28,7 @@ /** * Shows a toaster when a chat is incoming. * - * + * */ class ChatLobbyToaster : public QWidget { diff --git a/retroshare-gui/src/gui/toaster/ChatToaster.cpp b/retroshare-gui/src/gui/toaster/ChatToaster.cpp index 577ef48e3..c24a0d899 100644 --- a/retroshare-gui/src/gui/toaster/ChatToaster.cpp +++ b/retroshare-gui/src/gui/toaster/ChatToaster.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/ChatToaster.cpp * + * retroshare-gui/src/gui/toaster/ChatToaster.cpp * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/toaster/ChatToaster.h b/retroshare-gui/src/gui/toaster/ChatToaster.h index 44de636dc..3111e4dec 100644 --- a/retroshare-gui/src/gui/toaster/ChatToaster.h +++ b/retroshare-gui/src/gui/toaster/ChatToaster.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/ChatToaster.h * + * retroshare-gui/src/gui/toaster/ChatToaster.h * * * * Copyright (c) 2012 Retroshare Team * * * @@ -26,7 +26,7 @@ /** * Shows a toaster when a chat is incoming. * - * + * */ class ChatToaster : public QWidget { diff --git a/retroshare-gui/src/gui/toaster/DownloadToaster.cpp b/retroshare-gui/src/gui/toaster/DownloadToaster.cpp index 41b77c842..dc69d353b 100644 --- a/retroshare-gui/src/gui/toaster/DownloadToaster.cpp +++ b/retroshare-gui/src/gui/toaster/DownloadToaster.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/DownloadToaster.cpp * + * retroshare-gui/src/gui/toaster/DownloadToaster.cpp * * * * Copyright (c) 2010 Retroshare Team * * Copyright (C) 2007 - 2010 Xesc & Technology * diff --git a/retroshare-gui/src/gui/toaster/DownloadToaster.h b/retroshare-gui/src/gui/toaster/DownloadToaster.h index f63a6aadc..885a9f465 100644 --- a/retroshare-gui/src/gui/toaster/DownloadToaster.h +++ b/retroshare-gui/src/gui/toaster/DownloadToaster.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/DownloadToaster.h * + * retroshare-gui/src/gui/toaster/DownloadToaster.h * * * * Copyright (c) 2010 Retroshare Team * * Copyright (C) 2007 - 2010 Xesc & Technology * diff --git a/retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp b/retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp index f4968d55f..c463be397 100644 --- a/retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp +++ b/retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/FriendRequestToaster.cpp * + * retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp * * * * Copyright (c) 2010 Retroshare Team * * * @@ -43,7 +43,7 @@ FriendRequestToaster::FriendRequestToaster(const RsPgpId &gpgId, const RsPeerId ui.toasterButton->setEnabled(false); } connect(ui.closeButton, SIGNAL(clicked()), SLOT(hide())); - + QString peerName = QString::fromUtf8(details.name.c_str()); /* set informations */ diff --git a/retroshare-gui/src/gui/toaster/FriendRequestToaster.h b/retroshare-gui/src/gui/toaster/FriendRequestToaster.h index eebc85301..b207c63ba 100644 --- a/retroshare-gui/src/gui/toaster/FriendRequestToaster.h +++ b/retroshare-gui/src/gui/toaster/FriendRequestToaster.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/FriendRequestToaster.h * + * retroshare-gui/src/gui/toaster/FriendRequestToaster.h * * * * Copyright (c) 2010 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/toaster/GroupChatToaster.cpp b/retroshare-gui/src/gui/toaster/GroupChatToaster.cpp index 9bafc20da..0c18cf8f9 100644 --- a/retroshare-gui/src/gui/toaster/GroupChatToaster.cpp +++ b/retroshare-gui/src/gui/toaster/GroupChatToaster.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/GroupChatToaster.cpp * + * retroshare-gui/src/gui/toaster/GroupChatToaster.cpp * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/toaster/GroupChatToaster.h b/retroshare-gui/src/gui/toaster/GroupChatToaster.h index 314754032..b092d72ef 100644 --- a/retroshare-gui/src/gui/toaster/GroupChatToaster.h +++ b/retroshare-gui/src/gui/toaster/GroupChatToaster.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/GroupChatToaster.h * + * retroshare-gui/src/gui/toaster/GroupChatToaster.h * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/toaster/MessageToaster.cpp b/retroshare-gui/src/gui/toaster/MessageToaster.cpp index 1f4894ba3..50db73504 100644 --- a/retroshare-gui/src/gui/toaster/MessageToaster.cpp +++ b/retroshare-gui/src/gui/toaster/MessageToaster.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/MessageToaster.cpp * + * retroshare-gui/src/gui/toaster/MessageToaster.cpp * * * * Copyright (C) 2010 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/toaster/MessageToaster.h b/retroshare-gui/src/gui/toaster/MessageToaster.h index ad6013ec9..c68c3309f 100644 --- a/retroshare-gui/src/gui/toaster/MessageToaster.h +++ b/retroshare-gui/src/gui/toaster/MessageToaster.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/MessageToaster.h * + * retroshare-gui/src/gui/toaster/MessageToaster.h * * * * Copyright (C) 2007 - 2008 Xesc & Technology * * * diff --git a/retroshare-gui/src/gui/toaster/OnlineToaster.cpp b/retroshare-gui/src/gui/toaster/OnlineToaster.cpp index 23a8ac183..014ffb031 100644 --- a/retroshare-gui/src/gui/toaster/OnlineToaster.cpp +++ b/retroshare-gui/src/gui/toaster/OnlineToaster.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/OnlineToaster.cpp * + * retroshare-gui/src/gui/toaster/OnlineToaster.cpp * * * * Copyright (C) 2007 Crypton * * * diff --git a/retroshare-gui/src/gui/toaster/OnlineToaster.h b/retroshare-gui/src/gui/toaster/OnlineToaster.h index fa79a6d81..e14827e64 100644 --- a/retroshare-gui/src/gui/toaster/OnlineToaster.h +++ b/retroshare-gui/src/gui/toaster/OnlineToaster.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/OnlineToaster.h * + * retroshare-gui/src/gui/toaster/OnlineToaster.h * * * * Copyright (C) 2007 Crypton * * * diff --git a/retroshare-gui/src/gui/toaster/ToasterItem.cpp b/retroshare-gui/src/gui/toaster/ToasterItem.cpp index ee1730d38..b84b16dc2 100644 --- a/retroshare-gui/src/gui/toaster/ToasterItem.cpp +++ b/retroshare-gui/src/gui/toaster/ToasterItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/ToasterItem.cpp * + * retroshare-gui/src/gui/toaster/ToasterItem.cpp * * * * Copyright (C) 2015 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/toaster/ToasterItem.h b/retroshare-gui/src/gui/toaster/ToasterItem.h index bd8e88984..59ea2c324 100644 --- a/retroshare-gui/src/gui/toaster/ToasterItem.h +++ b/retroshare-gui/src/gui/toaster/ToasterItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/toaster/ToasterItem.h * + * retroshare-gui/src/gui/toaster/ToasterItem.h * * * * Copyright (C) 2015 Retroshare Team * * * diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp index 2a0420e7e..771f9ffc9 100644 --- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp +++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/unfinished/ApplicationWindow.cpp * + * retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp * * * * Copyright (C) 2006 Crypton * * * diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.h b/retroshare-gui/src/gui/unfinished/ApplicationWindow.h index 58f03907b..07220f49e 100644 --- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.h +++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/unfinished/ApplicationWindow.h * + * retroshare-gui/src/gui/unfinished/ApplicationWindow.h * * * * Copyright (C) 2006 Crypton * * * @@ -33,12 +33,12 @@ class ApplicationWindow : public QMainWindow public: /** Default Constructor */ ApplicationWindow(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); - + /** Destructor. */ ~ApplicationWindow(); - /* A Bit of a Hack... but public variables for - * the dialogs, so we can add them to the + /* A Bit of a Hack... but public variables for + * the dialogs, so we can add them to the * Notify Class... */ diff --git a/retroshare-gui/src/gui/unfinished/CalDialog.cpp b/retroshare-gui/src/gui/unfinished/CalDialog.cpp index e84c02d04..78e013d04 100644 --- a/retroshare-gui/src/gui/unfinished/CalDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/CalDialog.cpp @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ diff --git a/retroshare-gui/src/gui/unfinished/CalDialog.h b/retroshare-gui/src/gui/unfinished/CalDialog.h index 12232258b..5a604c86a 100644 --- a/retroshare-gui/src/gui/unfinished/CalDialog.h +++ b/retroshare-gui/src/gui/unfinished/CalDialog.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -39,7 +39,7 @@ class CalItem int status; }; -class CalDialog : public MainPage +class CalDialog : public MainPage { Q_OBJECT diff --git a/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp b/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp index e1d5c7809..dd2031c1f 100644 --- a/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -57,7 +57,7 @@ ExampleDialog::ExampleDialog(QWidget *parent) /* hide the Tree +/- */ ui.peertreeWidget -> setRootIsDecorated( false ); - + /* Set header resize modes and initial section sizes */ QHeaderView * _header = ui.peertreeWidget->header () ; QHeaderView_setSectionResizeModeColumn(_header, 0, QHeaderView::Custom); @@ -97,10 +97,10 @@ void ExampleDialog::peertreeWidgetCostumPopupMenu( QPoint point ) votedownAct = new QAction(QIcon(IMAGE_REMOVEFRIEND), tr( "Vote Down" ), this ); connect( votedownAct , SIGNAL( triggered() ), this, SLOT( votedown() ) ); - + contextMnu.clear(); contextMnu.addAction(voteupAct); - contextMnu.addSeparator(); + contextMnu.addSeparator(); contextMnu.addAction(votedownAct); contextMnu.exec( mevent->globalPos() ); } @@ -124,7 +124,7 @@ void ExampleDialog::insertExample() /* remove old items ??? */ peerWidget->clear(); peerWidget->setColumnCount(12); - + QList items; @@ -137,8 +137,8 @@ void ExampleDialog::insertExample() /* First 5 (1-5) Key Items */ /* () Status Icon */ item -> setText(0, ""); - - /* (0) Status */ + + /* (0) Status */ item -> setText(1, QString::fromStdString( it->second.statusString)); @@ -164,8 +164,8 @@ void ExampleDialog::insertExample() item -> setText(8, QString::fromStdString(it->second.loc)); /* () Country */ item -> setText(9, QString::fromStdString(it->second.country)); - - + + /* Hidden ones: */ /* () RsCertId */ { @@ -174,7 +174,7 @@ void ExampleDialog::insertExample() item -> setText(10, QString::fromStdString(out.str())); } - /* () AuthCode */ + /* () AuthCode */ item -> setText(11, QString::fromStdString(it->second.authCode)); /* change background */ @@ -207,7 +207,7 @@ void ExampleDialog::insertExample() } } } - + /* add to the list */ diff --git a/retroshare-gui/src/gui/unfinished/ExampleDialog.h b/retroshare-gui/src/gui/unfinished/ExampleDialog.h index 816b83956..7581f3b7d 100644 --- a/retroshare-gui/src/gui/unfinished/ExampleDialog.h +++ b/retroshare-gui/src/gui/unfinished/ExampleDialog.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -28,7 +28,7 @@ #include "ui_ExampleDialog.h" -class ExampleDialog : public MainPage +class ExampleDialog : public MainPage { Q_OBJECT @@ -45,7 +45,7 @@ private slots: void voteup(); void votedown(); - + private: /* Worker Functions */ diff --git a/retroshare-gui/src/gui/unfinished/GamesDialog.cpp b/retroshare-gui/src/gui/unfinished/GamesDialog.cpp index 9b9aee3a6..c62ef4b6f 100644 --- a/retroshare-gui/src/gui/unfinished/GamesDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/GamesDialog.cpp @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -77,7 +77,7 @@ GamesDialog::GamesDialog(QWidget *parent) /* hide the Tree +/- */ ui.peertreeWidget -> setRootIsDecorated( false ); - + /* Set header resize modes and initial section sizes */ // QHeaderView * _header = ui.peertreeWidget->header () ; // _header->setResizeMode (0, QHeaderView::Custom); @@ -92,7 +92,7 @@ GamesDialog::GamesDialog(QWidget *parent) // _header->setResizeMode (9, QHeaderView::Interactive); // _header->setResizeMode (10, QHeaderView::Interactive); // _header->setResizeMode (11, QHeaderView::Interactive); -// +// // _header->resizeSection ( 0, 25 ); // _header->resizeSection ( 1, 100 ); // _header->resizeSection ( 2, 100 ); @@ -183,7 +183,7 @@ void GamesDialog::updateGameDetails() { /* clear and finished */ detailWidget->clear(); - //detailWidget->update(); + //detailWidget->update(); mCurrentGame = ""; mCurrentGameStatus = ""; return; @@ -196,7 +196,7 @@ void GamesDialog::updateGameDetails() QTreeWidgetItem *oldSelect = getCurrentPeer(); QTreeWidgetItem *newSelect = NULL; std::string oldId; - if (mCurrentGame != gameId) + if (mCurrentGame != gameId) oldSelect = NULL; /* if we've changed game -> clear select */ if (oldSelect) @@ -226,7 +226,7 @@ void GamesDialog::updateGameDetails() if ((it->second).play == true) showPeer = true; } - + /* display */ if (showPeer) { @@ -257,7 +257,7 @@ void GamesDialog::updateGameDetails() /* add a checkItem here */ //item -> setText(GAME_PEER_PLAY, "Maybe"); item -> setText(GAME_PEER_ID, QString::fromStdString(it->second.id)); - + if ((oldSelect) && (oldId == it->first)) { newSelect = item; @@ -291,7 +291,7 @@ void GamesDialog::updateGameDetails() item -> setText(GAME_PEER_INTEREST, "?"); item -> setText(GAME_PEER_PLAY, "?"); item -> setText(GAME_PEER_ID, QString::fromStdString(*fit)); - + if ((oldSelect) && (oldId == *fit)) { newSelect = item; @@ -330,9 +330,9 @@ void GamesDialog::gameListPopupMenu( QPoint point ) connect( deleteAct , SIGNAL( triggered() ), this, SLOT( deleteGame() ) ); contextMnu.clear(); - contextMnu.addSeparator(); + contextMnu.addSeparator(); contextMnu.addAction(deleteAct); - contextMnu.addSeparator(); + contextMnu.addSeparator(); contextMnu.exec( mevent->globalPos() ); } diff --git a/retroshare-gui/src/gui/unfinished/GamesDialog.h b/retroshare-gui/src/gui/unfinished/GamesDialog.h index 748667a19..d01cc171f 100644 --- a/retroshare-gui/src/gui/unfinished/GamesDialog.h +++ b/retroshare-gui/src/gui/unfinished/GamesDialog.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -25,7 +25,7 @@ #include "retroshare-gui/mainpage.h" #include "ui_GamesDialog.h" -class GamesDialog : public MainPage +class GamesDialog : public MainPage { Q_OBJECT @@ -56,7 +56,7 @@ private slots: void updateGameList(); void updateGameDetails(); - /*** + /*** * */ diff --git a/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp b/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp index b257c58c7..77959b898 100644 --- a/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -56,20 +56,20 @@ LibraryDialog::LibraryDialog(QWidget *parent) { /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); - + connect(ui.shareFiles_btn,SIGNAL(clicked()),this, SLOT(CallShareFilesBtn_library())); //connect(ui.tileView_btn_library,SIGNAL(clicked()),this, SLOT(CallTileViewBtn_library())); //connect(ui.showDetails_btn_library,SIGNAL(clicked()),this, SLOT(CallShowDetailsBtn_library())); //connect(ui.createAlbum_btn_library,SIGNAL(clicked()),this, SLOT(CallCreateAlbumBtn_library())); //connect(ui.deleteAlbum_btn_library,SIGNAL(clicked()),this, SLOT(CallDeleteAlbumBtn_library())); //connect(ui.find_btn_library,SIGNAL(clicked()),this, SLOT(CallFindBtn_library())); - + //Load the library fileSystemModelLibraryFolders.setFilter(QDir::AllDirs|QDir::NoDotAndDotDot); fileSystemModelLibraryFolders.setRootPath(Settings.Library.Shares.join(" ")); ui.treeViewLibraryNavigatorFolders->setModel(&fileSystemModelLibraryFolders); - + /*QTimer *timer = new QTimer(this); timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate())); @@ -80,17 +80,17 @@ LibraryDialog::LibraryDialog(QWidget *parent) void LibraryDialog::copyFile() { - + } void LibraryDialog::DeleteFile() { - + } void LibraryDialog::RenameFile() { - + } void LibraryDialog::StopRename() @@ -132,7 +132,7 @@ void LibraryDialog::CallFindBtn_library() void LibraryDialog:: player() { - + } void LibraryDialog::browseFile() diff --git a/retroshare-gui/src/gui/unfinished/LibraryDialog.h b/retroshare-gui/src/gui/unfinished/LibraryDialog.h index 8d3ea2e60..b6dbedf2b 100644 --- a/retroshare-gui/src/gui/unfinished/LibraryDialog.h +++ b/retroshare-gui/src/gui/unfinished/LibraryDialog.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -30,7 +30,7 @@ #include #include "gui/RemoteDirModel.h" -class LibraryDialog : public MainPage +class LibraryDialog : public MainPage { Q_OBJECT @@ -41,16 +41,16 @@ public: private slots: - + void PopulateList(); - + void CallShareFilesBtn_library(); void CallTileViewBtn_library(); void CallShowDetailsBtn_library(); void CallCreateAlbumBtn_library(); - void CallDeleteAlbumBtn_library(); + void CallDeleteAlbumBtn_library(); void CallFindBtn_library(); - + void browseFile(); void player(); void PlayFrmList(); diff --git a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp index 83009c267..3ce373abd 100644 --- a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -95,7 +95,7 @@ PhotoDialog::PhotoDialog(QWidget *parent) QSize iconSize(PHOTO_ICON_SIZE,PHOTO_ICON_SIZE); ui.photoTreeWidget->setIconSize(iconSize); - + /* Set header resize modes and initial section sizes */ QHeaderView * ptw_header = ui.peerTreeWidget->header () ; ptw_header->setResizeMode (0, QHeaderView::Interactive); @@ -105,7 +105,7 @@ PhotoDialog::PhotoDialog(QWidget *parent) /* Set a GUI update timer - much cleaner than - * doing everything through the notify agent + * doing everything through the notify agent */ QTimer *timer = new QTimer(this); @@ -147,7 +147,7 @@ void PhotoDialog::photoTreeWidgetCustomPopupMenu( QPoint point ) QMenu contextMnu( this ); QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier ); - + QAction *openphotoAct = new QAction(QIcon(":/images/openimage.png"), tr( "Open" ), this ); openphotoAct->setShortcut(Qt::CTRL + Qt::Key_O); connect( openphotoAct , SIGNAL( triggered(QTreeWidgetItem * , int) ), this, SLOT( showPhoto( QTreeWidgetItem *, int ) ) ); @@ -155,31 +155,31 @@ void PhotoDialog::photoTreeWidgetCustomPopupMenu( QPoint point ) QAction *removephotoAct = new QAction(QIcon(IMAGE_REMOVE), tr( "Remove" ), this ); removephotoAct->setShortcut(Qt::Key_Delete); connect( removephotoAct , SIGNAL( triggered() ), this, SLOT( removePhoto() ) ); - + rateExcellenAct = new QAction(QIcon(":/images/rate-5.png"), tr("Excellent"), this); rateExcellenAct->setShortcut(Qt::CTRL + Qt::Key_5); connect(rateExcellenAct, SIGNAL(triggered()), this, SLOT(rateExcellent())); - + rateGoodAct = new QAction(QIcon(":/images/rate-4.png"), tr("Good"), this); rateGoodAct->setShortcut(Qt::CTRL + Qt::Key_4); connect(rateGoodAct, SIGNAL(triggered()), this, SLOT(rateGood())); - + rateAverageAct = new QAction(QIcon(":/images/rate-3.png"), tr("Average"), this); rateAverageAct->setShortcut(Qt::CTRL + Qt::Key_3); connect(rateAverageAct, SIGNAL(triggered()), this, SLOT(rateAvarge())); - + rateBelowAvarageAct = new QAction(QIcon(":/images/rate-2.png"), tr("Below avarage"), this); rateBelowAvarageAct->setShortcut(Qt::CTRL + Qt::Key_2); - connect(rateBelowAvarageAct, SIGNAL(triggered()), this, SLOT(rateBelowAverage())); - + connect(rateBelowAvarageAct, SIGNAL(triggered()), this, SLOT(rateBelowAverage())); + rateBadAct = new QAction(QIcon(":/images/rate-1.png"), tr("Bad"), this); rateBadAct->setShortcut(Qt::CTRL + Qt::Key_1); connect(rateBadAct, SIGNAL(triggered()), this, SLOT(rateBad())); - + rateUnratedAct = new QAction(tr("Unrated"), this); rateUnratedAct->setShortcut(Qt::CTRL + Qt::Key_0); connect(rateUnratedAct, SIGNAL(triggered()), this, SLOT(rateUnrated())); - + QMenu *ratingMenu = new QMenu(tr("Rating"), this); ratingMenu->addAction(rateExcellenAct); ratingMenu->addAction(rateGoodAct); @@ -193,13 +193,13 @@ void PhotoDialog::photoTreeWidgetCustomPopupMenu( QPoint point ) contextMnu.addSeparator(); contextMnu.addMenu( ratingMenu); contextMnu.addSeparator(); - contextMnu.addAction(removephotoAct); + contextMnu.addAction(removephotoAct); contextMnu.exec( mevent->globalPos() ); } void PhotoDialog::togglefileview() { - /* if msg header visible -> hide by changing splitter + /* if msg header visible -> hide by changing splitter * three widgets... */ @@ -344,7 +344,7 @@ void PhotoDialog::addShows(std::string id) void PhotoDialog::updatePhotoList() { -#ifdef PHOTO_DEBUG +#ifdef PHOTO_DEBUG std::cerr << "PhotoDialog::updatePhotoList()" << std::endl; #endif @@ -354,7 +354,7 @@ void PhotoDialog::updatePhotoList() if (!item) { /* leave current list */ -#ifdef PHOTO_DEBUG +#ifdef PHOTO_DEBUG std::cerr << "PhotoDialog::updatePhotoList() No Current item -> leave" << std::endl; #endif return; @@ -367,13 +367,13 @@ void PhotoDialog::updatePhotoList() if ((mCurrentPID == pid) && (mCurrentSID == sid)) { /* still good */ -#ifdef PHOTO_DEBUG +#ifdef PHOTO_DEBUG std::cerr << "PhotoDialog::updatePhotoList() List still good!" << std::endl; #endif return; } -#ifdef PHOTO_DEBUG +#ifdef PHOTO_DEBUG std::cerr << "PhotoDialog::updatePhotoList() pid: " << pid << " sid: " << sid << std::endl; #endif /* get the list of photos */ @@ -383,7 +383,7 @@ void PhotoDialog::updatePhotoList() if (sid != "") { -#ifdef PHOTO_DEBUG +#ifdef PHOTO_DEBUG std::cerr << "PhotoDialog::updatePhotoList() SID -> showing show" << std::endl; #endif /* load up show list */ @@ -398,7 +398,7 @@ void PhotoDialog::updatePhotoList() if (!rsPhoto->getPhotoDetails(pid, sit->photoId, photoDetail)) { -#ifdef PHOTO_DEBUG +#ifdef PHOTO_DEBUG std::cerr << "PhotoDialog::updatePhotoList() getPhotoDetails: " << sit->photoId << " FAILED" << std::endl; #endif continue; @@ -408,7 +408,7 @@ void PhotoDialog::updatePhotoList() if (photoDetail.isAvailable) { QPixmap qpp(QString::fromStdString(photoDetail.path)); - photoItem->setIcon(PHOTO_LIST_COL_PHOTO, + photoItem->setIcon(PHOTO_LIST_COL_PHOTO, QIcon(qpp.scaledToHeight(PHOTO_ICON_SIZE))); QSize iconSize(PHOTO_ICON_SIZE + 10,PHOTO_ICON_SIZE + 10); @@ -419,19 +419,19 @@ void PhotoDialog::updatePhotoList() photoItem->setText(PHOTO_LIST_COL_PHOTO, "Photo Not Available"); } - photoItem->setText(PHOTO_LIST_COL_NAME, + photoItem->setText(PHOTO_LIST_COL_NAME, QString::fromStdString(photoDetail.name)); - photoItem->setText(PHOTO_LIST_COL_COMMENT, + photoItem->setText(PHOTO_LIST_COL_COMMENT, QString::fromStdWString(photoDetail.comment)); - photoItem->setText(PHOTO_LIST_COL_DATE, + photoItem->setText(PHOTO_LIST_COL_DATE, QString::fromStdString(photoDetail.date)); - photoItem->setText(PHOTO_LIST_COL_LOCATION, + photoItem->setText(PHOTO_LIST_COL_LOCATION, QString::fromStdString(photoDetail.location)); - photoItem->setText(PHOTO_LIST_COL_SIZE, + photoItem->setText(PHOTO_LIST_COL_SIZE, QString::number(photoDetail.size)); - photoItem->setText(PHOTO_LIST_COL_PEERID, + photoItem->setText(PHOTO_LIST_COL_PEERID, QString::fromStdString(photoDetail.id)); - photoItem->setText(PHOTO_LIST_COL_PHOTOID, + photoItem->setText(PHOTO_LIST_COL_PHOTOID, QString::fromStdString(photoDetail.hash)); items.append(photoItem); @@ -439,7 +439,7 @@ void PhotoDialog::updatePhotoList() } else { -#ifdef PHOTO_DEBUG +#ifdef PHOTO_DEBUG std::cerr << "PhotoDialog::updatePhotoList() No SID -> show all" << std::endl; #endif @@ -452,7 +452,7 @@ void PhotoDialog::updatePhotoList() if (!rsPhoto->getPhotoDetails(pid, *pit, photoDetail)) { -#ifdef PHOTO_DEBUG +#ifdef PHOTO_DEBUG std::cerr << "PhotoDialog::updatePhotoList() getPhotoDetails: " << *pit << " FAILED" << std::endl; #endif continue; @@ -462,7 +462,7 @@ void PhotoDialog::updatePhotoList() if (photoDetail.isAvailable) { QPixmap qpp(QString::fromStdString(photoDetail.path)); - photoItem->setIcon(PHOTO_LIST_COL_PHOTO, + photoItem->setIcon(PHOTO_LIST_COL_PHOTO, QIcon(qpp.scaledToHeight(PHOTO_ICON_SIZE))); QSize iconSize(PHOTO_ICON_SIZE + 10,PHOTO_ICON_SIZE + 10); @@ -473,23 +473,23 @@ void PhotoDialog::updatePhotoList() photoItem->setText(PHOTO_LIST_COL_PHOTO, "Photo Not Available"); } - photoItem->setText(PHOTO_LIST_COL_NAME, + photoItem->setText(PHOTO_LIST_COL_NAME, QString::fromStdString(photoDetail.name)); - photoItem->setText(PHOTO_LIST_COL_COMMENT, + photoItem->setText(PHOTO_LIST_COL_COMMENT, QString::fromStdWString(photoDetail.comment)); - photoItem->setText(PHOTO_LIST_COL_DATE, + photoItem->setText(PHOTO_LIST_COL_DATE, QString::fromStdString(photoDetail.date)); - photoItem->setText(PHOTO_LIST_COL_LOCATION, + photoItem->setText(PHOTO_LIST_COL_LOCATION, QString::fromStdString(photoDetail.location)); - photoItem->setText(PHOTO_LIST_COL_SIZE, + photoItem->setText(PHOTO_LIST_COL_SIZE, QString::number(photoDetail.size)); - photoItem->setText(PHOTO_LIST_COL_PEERID, + photoItem->setText(PHOTO_LIST_COL_PEERID, QString::fromStdString(photoDetail.id)); - photoItem->setText(PHOTO_LIST_COL_PHOTOID, + photoItem->setText(PHOTO_LIST_COL_PHOTOID, QString::fromStdString(photoDetail.hash)); -#ifdef PHOTO_DEBUG +#ifdef PHOTO_DEBUG std::cerr << "PhotoDialog::updatePhotoList() added Item: " << *pit << std::endl; #endif items.append(photoItem); @@ -523,14 +523,14 @@ QTreeWidgetItem *PhotoDialog::getCurrentLine() QTreeWidgetItem *item = peerWidget -> currentItem(); if (!item) { -#ifdef PHOTO_DEBUG +#ifdef PHOTO_DEBUG std::cerr << "Invalid Current Item" << std::endl; #endif return NULL; } /* Display the columns of this item. */ -#ifdef PHOTO_DEBUG +#ifdef PHOTO_DEBUG std::ostringstream out; out << "CurrentPeerItem: " << std::endl; @@ -547,7 +547,7 @@ QTreeWidgetItem *PhotoDialog::getCurrentLine() void PhotoDialog::removePhoto() { QTreeWidgetItem *c = getCurrentLine(); -#ifdef PHOTO_DEBUG +#ifdef PHOTO_DEBUG std::cerr << "PhotoDialog::removePhoto()" << std::endl; #endif } diff --git a/retroshare-gui/src/gui/unfinished/PhotoDialog.h b/retroshare-gui/src/gui/unfinished/PhotoDialog.h index e8af5dd30..b42f8323a 100644 --- a/retroshare-gui/src/gui/unfinished/PhotoDialog.h +++ b/retroshare-gui/src/gui/unfinished/PhotoDialog.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -30,7 +30,7 @@ #include -class PhotoDialog : public MainPage +class PhotoDialog : public MainPage { Q_OBJECT @@ -53,7 +53,7 @@ private slots: void addPhotos(); void checkUpdate(); - + /* handle splitter */ void togglefileview(); @@ -78,7 +78,7 @@ private: /** Define the popup menus for the Context menu */ QMenu* contextMnu; - + QAction *rateExcellenAct; QAction *rateGoodAct; QAction *rateAverageAct; diff --git a/retroshare-gui/src/gui/unfinished/PhotoShow.cpp b/retroshare-gui/src/gui/unfinished/PhotoShow.cpp index 0edc7b36a..290893c7e 100644 --- a/retroshare-gui/src/gui/unfinished/PhotoShow.cpp +++ b/retroshare-gui/src/gui/unfinished/PhotoShow.cpp @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -66,7 +66,7 @@ void PhotoShow::photoCustomPopupMenu( QPoint point ) // // contextMnu.clear(); // contextMnu.addAction(rm); -// contextMnu.addSeparator(); +// contextMnu.addSeparator(); // contextMnu.exec( mevent->globalPos() ); } @@ -122,7 +122,7 @@ void PhotoShow::updatePhoto(std::string pid, std::string photoId) //ui.sizeLineEdit->setText(QString::number(photoDetail.size)); //ui.peeridLineEdit->setText(QString::fromStdString(photoDetail.id)); //ui.photoidLineEdit->setText(QString::fromStdString(photoDetail.hash)); - + } void PhotoShow::setPeerId(std::string id) diff --git a/retroshare-gui/src/gui/unfinished/PhotoShow.h b/retroshare-gui/src/gui/unfinished/PhotoShow.h index fbac1e12b..2d5ee7462 100644 --- a/retroshare-gui/src/gui/unfinished/PhotoShow.h +++ b/retroshare-gui/src/gui/unfinished/PhotoShow.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -30,7 +30,7 @@ #include -class PhotoShow : public QWidget +class PhotoShow : public QWidget { Q_OBJECT diff --git a/retroshare-gui/src/gui/unfinished/StatisticDialog.cpp b/retroshare-gui/src/gui/unfinished/StatisticDialog.cpp index eac60c48b..cf6a7a2bf 100644 --- a/retroshare-gui/src/gui/unfinished/StatisticDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/StatisticDialog.cpp @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -52,7 +52,7 @@ StatisticDialog::StatisticDialog(QWidget *parent) /* Initialize Sent/Receive data counters */ reset(); - + /* Hide Bandwidth Graph Settings frame */ showSettingsFrame(false); @@ -73,7 +73,7 @@ StatisticDialog::StatisticDialog(QWidget *parent) ui.frmOpacity->setVisible(false); } #endif - + #if defined(Q_WS_X11) ui.frmOpacity->setVisible(false); #endif @@ -145,7 +145,7 @@ StatisticDialog::createActions() connect(ui.btnCancelSettings, SIGNAL(clicked()), this, SLOT(cancelChanges())); - + connect(ui.sldrOpacity, SIGNAL(valueChanged(int)), this, SLOT(setOpacity(int))); } @@ -169,7 +169,7 @@ StatisticDialog::loadSettings() { /* Set window opacity slider widget */ ui.sldrOpacity->setValue(_settings->getBWGraphOpacity()); - + /* Set the line filter checkboxes accordingly */ @@ -182,14 +182,14 @@ StatisticDialog::loadSettings() ui.chkSendRate->isChecked()); } -/** +/** Resets the log start time */ void StatisticDialog::reset() { /* Set to current time */ -// ui.statusbar->showMessage(tr("Since:") + " " + +// ui.statusbar->showMessage(tr("Since:") + " " + // QDateTime::currentDateTime() // .toString(DATETIME_FMT)); /* Reset the graph */ @@ -204,12 +204,12 @@ StatisticDialog::saveChanges() { /* Hide the settings frame and reset toggle button */ showSettingsFrame(false); - + /* Save the opacity */ Settings->setBWGraphOpacity(ui.sldrOpacity->value()); - + /* Save the line filter values */ Settings->setBWGraphFilter(BWGRAPH_REC, ui.chkReceiveRate->isChecked()); Settings->setBWGraphFilter(BWGRAPH_SEND, ui.chkSendRate->isChecked()); @@ -223,10 +223,10 @@ StatisticDialog::saveChanges() showNormal(); } -/** +/** Simply restores the previously saved settings */ -void +void StatisticDialog::cancelChanges() { /* Hide the settings frame and reset toggle button */ @@ -236,7 +236,7 @@ StatisticDialog::cancelChanges() loadSettings(); } -/** +/** Toggles the Settings pane on and off, changes toggle button text */ void @@ -260,7 +260,7 @@ void StatisticDialog::setOpacity(int value) { qreal newValue = value / 100.0; - + /* Opacity only supported by Mac and Win32 */ #if defined(Q_WS_MAC) this->setWindowOpacity(newValue); diff --git a/retroshare-gui/src/gui/unfinished/StatisticDialog.h b/retroshare-gui/src/gui/unfinished/StatisticDialog.h index 985df73a3..ac4314209 100644 --- a/retroshare-gui/src/gui/unfinished/StatisticDialog.h +++ b/retroshare-gui/src/gui/unfinished/StatisticDialog.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -35,7 +35,7 @@ /** Redraw graph every 1000ms **/ #define REFRESH_RATE 1000 -class StatisticDialog : public MainPage +class StatisticDialog : public MainPage { Q_OBJECT @@ -63,13 +63,13 @@ private slots: /** Called when the reset button is pressed */ void reset(); - + private: /** Create and bind actions to events **/ void createActions(); /** Loads the saved Bandwidth Graph settings */ void loadSettings(); - + /** Qt Designer generated object */ Ui::StatisticDialog ui; }; diff --git a/retroshare-gui/src/gui/unfinished/profile/ProfileEdit.h b/retroshare-gui/src/gui/unfinished/profile/ProfileEdit.h index 49b2abede..e67145787 100644 --- a/retroshare-gui/src/gui/unfinished/profile/ProfileEdit.h +++ b/retroshare-gui/src/gui/unfinished/profile/ProfileEdit.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -47,7 +47,7 @@ private slots: /** context popup menus */ void profileCustomPopupMenu( QPoint point ); - + /* for Profile */ void profileEntryAdd(); void profileEntryRemove(); diff --git a/retroshare-gui/src/gui/unfinished/profile/ProfileView.h b/retroshare-gui/src/gui/unfinished/profile/ProfileView.h index 823271c59..1e0fa6fee 100644 --- a/retroshare-gui/src/gui/unfinished/profile/ProfileView.h +++ b/retroshare-gui/src/gui/unfinished/profile/ProfileView.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -53,7 +53,7 @@ private slots: void imageCustomPopupMenu( QPoint point ); void profileCustomPopupMenu( QPoint point ); void fileCustomPopupMenu( QPoint point ); - + /* For context Menus */ /* Image Context Menu */ void selectimagefile(); @@ -63,7 +63,7 @@ private slots: void profileEdit(); /* for Favourite Files */ - void fileRemove(); + void fileRemove(); void filesClear(); void fileDownload(); void filesDownloadAll(); diff --git a/retroshare-gui/src/idle/idle.cpp b/retroshare-gui/src/idle/idle.cpp index 71ed46e48..90f40adc9 100644 --- a/retroshare-gui/src/idle/idle.cpp +++ b/retroshare-gui/src/idle/idle.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * idle/idle.h * + * retroshare-gui/src/idle/idle.cpp * * * * Copyright (C) 2003 Justin Karneges * * * @@ -118,7 +118,7 @@ int Idle::secondsIdle() //else if(t > 0) { //t is always > 0 // // do nothing //} - + // how long have we been idle? int idleTime = d->startTime.secsTo(QDateTime::currentDateTime()); return idleTime; diff --git a/retroshare-gui/src/idle/idle.h b/retroshare-gui/src/idle/idle.h index af0e17c42..4a374119f 100644 --- a/retroshare-gui/src/idle/idle.h +++ b/retroshare-gui/src/idle/idle.h @@ -1,5 +1,5 @@ /******************************************************************************* - * idle/idle.h * + * retroshare-gui/src/idle/idle.h * * * * Copyright (C) 2003 Justin Karneges * * * diff --git a/retroshare-gui/src/idle/idle_platform.cpp b/retroshare-gui/src/idle/idle_platform.cpp index c3d582acc..75c6ea6b9 100644 --- a/retroshare-gui/src/idle/idle_platform.cpp +++ b/retroshare-gui/src/idle/idle_platform.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * idle/idle.cpp * + * retroshare-gui/src/idle/idle_platform.cpp * * * * Copyright (C) 2003 Justin Karneges * * * diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp index dd343bf03..3f8582497 100644 --- a/retroshare-gui/src/main.cpp +++ b/retroshare-gui/src/main.cpp @@ -34,7 +34,7 @@ CrashStackTrace gCrashStackTrace; #include #include -#include +#include "rshare.h" #include "gui/common/FilesDefs.h" #include "gui/FriendsDialog.h" #include "gui/GenCertDialog.h" @@ -105,9 +105,9 @@ __declspec(dllexport) __cdecl BOOL _OPENSSL_isservice(void) #endif #endif -#include -#include -#include +#include "util/stringutil.h" +#include "retroshare/rsinit.h" +#include "retroshare/rsiface.h" #include "gui/RsGUIEventManager.h" #include diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index e8362a885..0c9d1f481 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -19,8 +19,8 @@ !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") TEMPLATE = app -QT += network xml -CONFIG += qt gui uic qrc resources idle +QT += network xml +CONFIG += qt gui uic qrc resources idle CONFIG += console TARGET = retroshare DEFINES += TARGET=\\\"$${TARGET}\\\" @@ -92,7 +92,7 @@ FORMS += TorControl/TorControlWindow.ui SOURCES += TorControl/TorControlWindow.cpp HEADERS += TorControl/TorControlWindow.h -#QMAKE_CFLAGS += -fmudflap +#QMAKE_CFLAGS += -fmudflap #LIBS *= /usr/lib/gcc/x86_64-linux-gnu/4.4/libmudflap.a /usr/lib/gcc/x86_64-linux-gnu/4.4/libmudflapth.a greaterThan(QT_MAJOR_VERSION, 4) { @@ -135,7 +135,7 @@ linux-* { PKGCONFIG *= x11 xscrnsaver - LIBS *= -rdynamic + LIBS *= -rdynamic DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions } @@ -283,7 +283,7 @@ macx { $$PWD/gui/qss/chat/Bubble \ $$PWD/gui/qss/chat/Bubble_Compact dplChatStyles.path = Contents/Resources/stylesheets - QMAKE_BUNDLE_DATA += dplChatStyles + QMAKE_BUNDLE_DATA += dplChatStyles # mac_webui.files = $$files($$PWD/../../libresapi/src/webui) # mac_webui.path = Contents/Resources # QMAKE_BUNDLE_DATA += mac_webui @@ -291,7 +291,7 @@ macx { OBJECTS_DIR = temp/obj CONFIG += version_detail_bash_script - LIBS += -lssl -lcrypto -lz + LIBS += -lssl -lcrypto -lz for(lib, LIB_DIR):exists($$lib/libminiupnpc.a){ LIBS += $$lib/libminiupnpc.a} LIBS += -framework CoreFoundation LIBS += -framework Security @@ -1040,9 +1040,9 @@ unfinishedtranslations { } messenger { - SOURCES += gui/MessengerWindow.cpp - HEADERS += gui/MessengerWindow.h - FORMS += gui/MessengerWindow.ui + SOURCES += gui/MessengerWindow.cpp + HEADERS += gui/MessengerWindow.h + FORMS += gui/MessengerWindow.ui DEFiNES += MESSENGER_WINDOW } @@ -1094,11 +1094,11 @@ rs_efs { } # BELOW IS GXS Unfinished Services. - + unfinished_services { - + DEPENDPATH += gui/unfinished \ - + HEADERS += gui/unfinished/ApplicationWindow.h \ # gui/unfinished/CalDialog.h \ @@ -1109,7 +1109,7 @@ unfinished_services { # gui/unfinished/StatisticDialog.h \ # gui/unfinished/PhotoDialog.h \ # gui/unfinished/PhotoShow.h \ - + FORMS += gui/unfinished/ApplicationWindow.ui \ # gui/unfinished/CalDialog.ui \ @@ -1120,7 +1120,7 @@ unfinished_services { # gui/unfinished/StatisticDialog.ui \ # gui/unfinished/PhotoDialog.ui \ # gui/unfinished/PhotoShow.ui \ - + SOURCES += gui/unfinished/ApplicationWindow.cpp \ # gui/unfinished/CalDialog.cpp \ @@ -1131,11 +1131,11 @@ unfinished_services { # gui/unfinished/StatisticDialog.cpp \ # gui/unfinished/PhotoDialog.cpp \ # gui/unfinished/PhotoShow.cpp \ - + DEFINES *= UNFINISHED } - - + + gxsphotoshare { #DEFINES += RS_USE_PHOTOSHARE # to enable in unfinished. DEFINES += RS_USE_PHOTO # enable in MainWindow @@ -1176,14 +1176,14 @@ gxsphotoshare { RESOURCES += gui/PhotoShare/Photo_images.qrc } - - + + wikipoos { DEFINES += RS_USE_WIKI - + DEPENDPATH += ../../supportlibs/pegmarkdown INCLUDEPATH += ../../supportlibs/pegmarkdown - + HEADERS += gui/WikiPoos/WikiDialog.h \ gui/WikiPoos/WikiAddDialog.h \ gui/WikiPoos/WikiEditDialog.h \ @@ -1192,7 +1192,7 @@ wikipoos { FORMS += gui/WikiPoos/WikiDialog.ui \ gui/WikiPoos/WikiAddDialog.ui \ gui/WikiPoos/WikiEditDialog.ui \ - + SOURCES += gui/WikiPoos/WikiDialog.cpp \ gui/WikiPoos/WikiAddDialog.cpp \ gui/WikiPoos/WikiEditDialog.cpp \ @@ -1201,11 +1201,11 @@ wikipoos { RESOURCES += gui/WikiPoos/Wiki_images.qrc } - - - + + + gxsthewire { - + DEFINES += RS_USE_WIRE HEADERS += gui/TheWire/WireDialog.h \ @@ -1230,7 +1230,7 @@ gxsthewire { gui/TheWire/PulseReply.ui \ gui/TheWire/PulseReplySeperator.ui \ gui/TheWire/PulseMessage.ui \ - + SOURCES += gui/TheWire/WireDialog.cpp \ gui/TheWire/WireGroupItem.cpp \ gui/TheWire/WireGroupDialog.cpp \ @@ -1248,13 +1248,13 @@ gxsthewire { } identities { - + HEADERS += \ gui/Identity/IdDialog.h \ gui/Identity/IdentityListModel.h \ gui/Identity/IdEditDialog.h \ gui/Identity/IdDetailsDialog.h \ - + FORMS += gui/Identity/IdDialog.ui \ gui/Identity/IdEditDialog.ui \ gui/Identity/IdDetailsDialog.ui \ @@ -1264,9 +1264,9 @@ identities { gui/Identity/IdentityListModel.cpp \ gui/Identity/IdEditDialog.cpp \ gui/Identity/IdDetailsDialog.cpp \ - + } - + gxscircles { DEFINES += RS_USE_CIRCLES # DEFINES += RS_USE_NEW_PEOPLE_DIALOG @@ -1274,10 +1274,10 @@ gxscircles { HEADERS += \ gui/Circles/CirclesDialog.h \ gui/Circles/CreateCircleDialog.h \ - + FORMS += gui/Circles/CirclesDialog.ui \ gui/Circles/CreateCircleDialog.ui \ - + SOURCES += \ gui/Circles/CirclesDialog.cpp \ gui/Circles/CreateCircleDialog.cpp \ @@ -1286,11 +1286,11 @@ gxscircles { HEADERS += gui/People/CircleWidget.h HEADERS += gui/People/IdentityWidget.h - FORMS += gui/People/PeopleDialog.ui + FORMS += gui/People/PeopleDialog.ui FORMS += gui/People/CircleWidget.ui FORMS += gui/People/IdentityWidget.ui - SOURCES += gui/People/PeopleDialog.cpp + SOURCES += gui/People/PeopleDialog.cpp SOURCES += gui/People/CircleWidget.cpp SOURCES += gui/People/IdentityWidget.cpp @@ -1303,8 +1303,8 @@ gxscircles { } - - + + gxsforums { HEADERS += gui/gxsforums/GxsForumsDialog.h \ @@ -1330,10 +1330,10 @@ gxsforums { gui/feeds/GxsForumGroupItem.cpp \ gui/feeds/GxsForumMsgItem.cpp } - - + + gxschannels { - + HEADERS += gui/gxschannels/GxsChannelDialog.h \ gui/gxschannels/GxsChannelGroupDialog.h \ gui/gxschannels/CreateGxsChannelMsg.h \ @@ -1345,14 +1345,14 @@ gxschannels { gui/feeds/GxsChannelGroupItem.h \ gui/feeds/GxsChannelPostItem.h \ gui/gxschannels/GxsChannelUserNotify.h - + FORMS += \ gui/gxschannels/GxsChannelPostsWidgetWithModel.ui \ gui/gxschannels/GxsChannelFilesStatusWidget.ui \ gui/gxschannels/CreateGxsChannelMsg.ui \ gui/feeds/GxsChannelGroupItem.ui \ gui/feeds/GxsChannelPostItem.ui - + SOURCES += gui/gxschannels/GxsChannelDialog.cpp \ gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp \ gui/gxschannels/GxsChannelPostsModel.cpp \ @@ -1365,10 +1365,10 @@ gxschannels { gui/feeds/GxsChannelPostItem.cpp \ gui/gxschannels/GxsChannelUserNotify.cpp } - - + + posted { - + HEADERS += gui/Posted/PostedDialog.h \ gui/Posted/PostedListWidgetWithModel.h \ gui/Posted/PostedPostsModel.h \ @@ -1383,7 +1383,7 @@ posted { #gui/Posted/PostedCreateCommentDialog.h \ #gui/Posted/PostedComments.h \ - + FORMS += gui/Posted/PostedListWidgetWithModel.ui \ gui/feeds/PostedGroupItem.ui \ gui/Posted/BoardPostDisplayWidget_compact.ui \ @@ -1395,7 +1395,7 @@ posted { #gui/Posted/PostedDialog.ui \ #gui/Posted/PostedComments.ui \ #gui/Posted/PostedCreateCommentDialog.ui - + SOURCES += gui/Posted/PostedDialog.cpp \ gui/Posted/PostedListWidgetWithModel.cpp \ gui/Posted/BoardPostDisplayWidget.cpp \ @@ -1411,12 +1411,12 @@ posted { #gui/Posted/PostedDialog.cpp \ #gui/Posted/PostedComments.cpp \ #gui/Posted/PostedCreateCommentDialog.cpp - + RESOURCES += gui/Posted/Posted_images.qrc } - + gxsgui { - + HEADERS += gui/gxs/GxsGroupDialog.h \ gui/gxs/GxsIdDetails.h \ gui/gxs/GxsIdChooser.h \ @@ -1436,18 +1436,18 @@ gxsgui { # gui/gxs/GxsFeedWidget.h \ util/TokenQueue.h \ util/RsGxsUpdateBroadcast.h \ - + # gui/gxs/GxsMsgDialog.h \ - + FORMS += gui/gxs/GxsGroupDialog.ui \ gui/gxs/GxsCommentContainer.ui \ gui/gxs/GxsCommentDialog.ui \ gui/gxs/GxsCreateCommentDialog.ui \ gui/gxs/GxsGroupFrameDialog.ui\ - gui/gxs/GxsGroupShareKey.ui + gui/gxs/GxsGroupShareKey.ui # gui/gxs/GxsMsgDialog.ui \ -# gui/gxs/GxsCommentTreeWidget.ui - +# gui/gxs/GxsCommentTreeWidget.ui + SOURCES += gui/gxs/GxsGroupDialog.cpp \ gui/gxs/GxsIdDetails.cpp \ gui/gxs/GxsIdChooser.cpp \ @@ -1467,10 +1467,10 @@ gxsgui { # gui/gxs/GxsFeedWidget.cpp \ util/TokenQueue.cpp \ util/RsGxsUpdateBroadcast.cpp \ - + # gui/gxs/GxsMsgDialog.cpp \ - - + + } @@ -1478,7 +1478,7 @@ wikipoos { HEADERS += \ gui/gxs/RsGxsUpdateBroadcastBase.h \ gui/gxs/RsGxsUpdateBroadcastWidget.h \ - gui/gxs/RsGxsUpdateBroadcastPage.h + gui/gxs/RsGxsUpdateBroadcastPage.h SOURCES += \ gui/gxs/RsGxsUpdateBroadcastBase.cpp \ diff --git a/retroshare-gui/src/retroshare-gui/RsAutoUpdatePage.h b/retroshare-gui/src/retroshare-gui/RsAutoUpdatePage.h index 31e975696..dc4208acd 100644 --- a/retroshare-gui/src/retroshare-gui/RsAutoUpdatePage.h +++ b/retroshare-gui/src/retroshare-gui/RsAutoUpdatePage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * gui/RsAutoUpdatePage.h * + * retroshare-gui/src/gui/RsAutoUpdatePage.h * * * * Copyright (c) 2009 Retroshare Team * * * @@ -58,7 +58,7 @@ class RsAutoUpdatePage: public MainPage // This is overloaded in subclasses. // virtual void updateDisplay() {} - + virtual void showEvent(QShowEvent *e) ; private slots: diff --git a/retroshare-gui/src/retroshare-gui/configpage.h b/retroshare-gui/src/retroshare-gui/configpage.h index d0d0625dc..76eea5627 100644 --- a/retroshare-gui/src/retroshare-gui/configpage.h +++ b/retroshare-gui/src/retroshare-gui/configpage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * retroshare-gui/configpage.h * + * retroshare-gui/src/retroshare-gui/configpage.h * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * diff --git a/retroshare-gui/src/retroshare-gui/mainpage.h b/retroshare-gui/src/retroshare-gui/mainpage.h index f0138a123..82db28d14 100644 --- a/retroshare-gui/src/retroshare-gui/mainpage.h +++ b/retroshare-gui/src/retroshare-gui/mainpage.h @@ -1,5 +1,5 @@ /******************************************************************************* - * retroshare-gui/mainpage.h * + * retroshare-gui/src/retroshare-gui/mainpage.h * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * diff --git a/retroshare-gui/src/util/ClickableLabel.cpp b/retroshare-gui/src/util/ClickableLabel.cpp index ee16abdc8..88dcc4787 100644 --- a/retroshare-gui/src/util/ClickableLabel.cpp +++ b/retroshare-gui/src/util/ClickableLabel.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . * * * *******************************************************************************/ - + #include "ClickableLabel.h" /** Constructor */ diff --git a/retroshare-gui/src/util/ClickableLabel.h b/retroshare-gui/src/util/ClickableLabel.h index 610a1eabd..60eb9a361 100644 --- a/retroshare-gui/src/util/ClickableLabel.h +++ b/retroshare-gui/src/util/ClickableLabel.h @@ -25,8 +25,8 @@ #include #include -class ClickableLabel : public QLabel { - Q_OBJECT +class ClickableLabel : public QLabel { + Q_OBJECT public: explicit ClickableLabel(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); diff --git a/retroshare-gui/src/util/DateTime.cpp b/retroshare-gui/src/util/DateTime.cpp index ea81e69fd..3f6947873 100644 --- a/retroshare-gui/src/util/DateTime.cpp +++ b/retroshare-gui/src/util/DateTime.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/DateTime.cpp * + * retroshare-gui/src/util/DateTime.cpp * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/util/EventFilter.cpp b/retroshare-gui/src/util/EventFilter.cpp index 3dcd91b28..465078452 100644 --- a/retroshare-gui/src/util/EventFilter.cpp +++ b/retroshare-gui/src/util/EventFilter.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/EventFilter.cpp * + * retroshare-gui/src/util/EventFilter.cpp * * * * Copyright (C) 2006, 2007 crypton * * * diff --git a/retroshare-gui/src/util/EventFilter.h b/retroshare-gui/src/util/EventFilter.h index 16f89d3c3..8e564ac26 100644 --- a/retroshare-gui/src/util/EventFilter.h +++ b/retroshare-gui/src/util/EventFilter.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/EventFilter.h * + * retroshare-gui/src/util/EventFilter.h * * * * Copyright (C) 2006, 2007 crypton * * * @@ -42,7 +42,7 @@ class QEvent; * widget->installEventFilter(resizeFilter); * * - * + * */ class RSQTUTIL_API EventFilter : public QObject, NonCopyable { Q_OBJECT diff --git a/retroshare-gui/src/util/FontSizeHandler.cpp b/retroshare-gui/src/util/FontSizeHandler.cpp index 51da29032..c9e264961 100644 --- a/retroshare-gui/src/util/FontSizeHandler.cpp +++ b/retroshare-gui/src/util/FontSizeHandler.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/FontSizeHandler.cpp * + * retroshare-gui/src/util/FontSizeHandler.cpp * * * * Copyright (C) 2025, Retroshare Team * * * diff --git a/retroshare-gui/src/util/FontSizeHandler.h b/retroshare-gui/src/util/FontSizeHandler.h index bf9c8058b..6f0c56c1c 100644 --- a/retroshare-gui/src/util/FontSizeHandler.h +++ b/retroshare-gui/src/util/FontSizeHandler.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/FontSizeHandler.h * + * retroshare-gui/src/util/FontSizeHandler.h * * * * Copyright (C) 2025, Retroshare Team * * * diff --git a/retroshare-gui/src/util/HandleRichText.cpp b/retroshare-gui/src/util/HandleRichText.cpp index 5a4a166a4..1d37ef4a6 100644 --- a/retroshare-gui/src/util/HandleRichText.cpp +++ b/retroshare-gui/src/util/HandleRichText.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/HandleRichText.cpp * + * retroshare-gui/src/util/HandleRichText.cpp * * * * Copyright (c) 2010 Thomas Kister * * * @@ -148,8 +148,8 @@ public: }; } }; - - + + /** * This class is used to store information for embedding smileys into tags. * @@ -572,7 +572,7 @@ static QString saveSpace(const QString text) for(int i=0;i'))) { getKeyName=keyName.isEmpty(); @@ -972,7 +972,7 @@ static void optimizeHtml(QDomDocument& doc pair.replace(" ",""); if (!pair.isEmpty()) { QStringList& stylesListItem = stylesList[pair]; - + //Add the new class to this value stylesListItem.push_back(className); } @@ -1186,7 +1186,7 @@ void RsHtml::optimizeHtml(QString &text, unsigned int flag /*= 0*/ } QDomElement body = doc.documentElement(); - + QHash stylesList; QHash knownStyle; diff --git a/retroshare-gui/src/util/HandleRichText.h b/retroshare-gui/src/util/HandleRichText.h index cefb40c70..aaf836720 100644 --- a/retroshare-gui/src/util/HandleRichText.h +++ b/retroshare-gui/src/util/HandleRichText.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/HandleRichText.h * + * retroshare-gui/src/util/HandleRichText.h * * * * Copyright (c) 2010 Thomas Kister * * * @@ -18,7 +18,7 @@ * * *******************************************************************************/ -#include +#include "gui/common/RSTextBrowser.h" /** * This file provides helper functions and functors for translating data from/to diff --git a/retroshare-gui/src/util/MouseEventFilter.cpp b/retroshare-gui/src/util/MouseEventFilter.cpp index f2412037e..b11f1009e 100644 --- a/retroshare-gui/src/util/MouseEventFilter.cpp +++ b/retroshare-gui/src/util/MouseEventFilter.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/MouseEventFilter.cpp * + * retroshare-gui/src/util/MouseEventFilter.cpp * * * * Copyright (c) 2006, Crypton * * * diff --git a/retroshare-gui/src/util/MouseEventFilter.h b/retroshare-gui/src/util/MouseEventFilter.h index 9d8b4ba6e..5ca60c820 100644 --- a/retroshare-gui/src/util/MouseEventFilter.h +++ b/retroshare-gui/src/util/MouseEventFilter.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/MouseEventFilter.h * + * retroshare-gui/src/util/MouseEventFilter.h * * * * Copyright (c) 2006, Crypton * * * @@ -26,7 +26,7 @@ /** * Catch MouseMove event. * - * + * */ class RSQTUTIL_API MouseMoveEventFilter : public EventFilter { public: @@ -42,7 +42,7 @@ private: /** * Catch MouseButtonPress event. * - * + * */ class RSQTUTIL_API MousePressEventFilter : public EventFilter { public: @@ -60,7 +60,7 @@ private: /** * Catch MouseButtonRelease event. * - * + * */ class RSQTUTIL_API MouseReleaseEventFilter : public EventFilter { public: @@ -78,7 +78,7 @@ private: /** * Catch HoverEnter event. * - * + * */ class RSQTUTIL_API MouseHoverEnterEventFilter : public EventFilter { public: @@ -94,7 +94,7 @@ private: /** * Catch HoverLeave event. * - * + * */ class RSQTUTIL_API MouseHoverLeaveEventFilter : public EventFilter { public: diff --git a/retroshare-gui/src/util/NonCopyable.h b/retroshare-gui/src/util/NonCopyable.h index 903398859..ba8b5ab75 100644 --- a/retroshare-gui/src/util/NonCopyable.h +++ b/retroshare-gui/src/util/NonCopyable.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/NonCopyable.h * + * retroshare-gui/src/util/NonCopyable.h * * * * Copyright (c) 2006, Crypton * * * @@ -21,7 +21,7 @@ #ifndef NONCOPYABLE_H #define NONCOPYABLE_H -#include +#include "util/rsutildll.h" /** * Ensures derived classes have private copy constructor and copy assignment. @@ -37,7 +37,7 @@ * Taken from Boost library. * * @see boost::noncopyable - * + * */ class NonCopyable { protected: diff --git a/retroshare-gui/src/util/ObjectPainter.cpp b/retroshare-gui/src/util/ObjectPainter.cpp index 06716a8f3..6f8252bc2 100644 --- a/retroshare-gui/src/util/ObjectPainter.cpp +++ b/retroshare-gui/src/util/ObjectPainter.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/ObjectPainter.cpp * + * retroshare-gui/src/util/ObjectPainter.cpp * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/util/ObjectPainter.h b/retroshare-gui/src/util/ObjectPainter.h index b48c67b6d..f404dd6ea 100644 --- a/retroshare-gui/src/util/ObjectPainter.h +++ b/retroshare-gui/src/util/ObjectPainter.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/ObjectPainter.h * + * retroshare-gui/src/util/ObjectPainter.h * * * * Copyright (c) 2012 Retroshare Team * * * diff --git a/retroshare-gui/src/util/PixmapMerging.cpp b/retroshare-gui/src/util/PixmapMerging.cpp index 168fad7ab..d6130b6b6 100644 --- a/retroshare-gui/src/util/PixmapMerging.cpp +++ b/retroshare-gui/src/util/PixmapMerging.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/PixmapMerging.cpp * + * retroshare-gui/src/util/PixmapMerging.cpp * * * * Copyright (c) 2012 Crypton * * * @@ -19,8 +19,8 @@ *******************************************************************************/ #ifdef UNUSED_CODE -#include -#include +#include "gui/gxs/GxsIdDetails.h" +#include "util/PixmapMerging.h" #include #include diff --git a/retroshare-gui/src/util/PixmapMerging.h b/retroshare-gui/src/util/PixmapMerging.h index 217652f23..3abae86e1 100644 --- a/retroshare-gui/src/util/PixmapMerging.h +++ b/retroshare-gui/src/util/PixmapMerging.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/PixmapMerging.h * + * retroshare-gui/src/util/PixmapMerging.h * * * * Copyright (c) 2012 Crypton * * * @@ -22,9 +22,9 @@ #define PIXMAPMERGING_H #ifdef UNUSED_CODE -#include +#include "util/rsqtutildll.h" -#include +#include "util/NonCopyable.h" #include @@ -33,7 +33,7 @@ class QPixmap; /** * Merges 2 pixmaps together. * - * + * */ class PixmapMerging : NonCopyable { public: diff --git a/retroshare-gui/src/util/RetroStyleLabel.cpp b/retroshare-gui/src/util/RetroStyleLabel.cpp index 3023120ae..54727d2f0 100644 --- a/retroshare-gui/src/util/RetroStyleLabel.cpp +++ b/retroshare-gui/src/util/RetroStyleLabel.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RetroStyleLabel.cpp * + * retroshare-gui/src/util/RetroStyleLabel.cpp * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * @@ -19,7 +19,7 @@ * * *******************************************************************************/ -#include +#include "util/RetroStyleLabel.h" #include #include diff --git a/retroshare-gui/src/util/RetroStyleLabel.h b/retroshare-gui/src/util/RetroStyleLabel.h index 07fbbd57c..b9cba1ba4 100644 --- a/retroshare-gui/src/util/RetroStyleLabel.h +++ b/retroshare-gui/src/util/RetroStyleLabel.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RetroStyleLabel.h * + * retroshare-gui/src/util/RetroStyleLabel.h * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * @@ -22,7 +22,7 @@ #ifndef RETROSTYLELABEL_H #define RETROSTYLELABEL_H -#include +#include "util/rsqtutildll.h" #include #include diff --git a/retroshare-gui/src/util/RichTextEdit.cpp b/retroshare-gui/src/util/RichTextEdit.cpp index 1f53af489..d66855d4f 100644 --- a/retroshare-gui/src/util/RichTextEdit.cpp +++ b/retroshare-gui/src/util/RichTextEdit.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RichTextEdit.cpp * + * retroshare-gui/src/util/RichTextEdit.cpp * * * * Copyright (c) 2019 Retroshare Team * * * diff --git a/retroshare-gui/src/util/RichTextEdit.h b/retroshare-gui/src/util/RichTextEdit.h index 6e4869838..b4bcf3cc0 100644 --- a/retroshare-gui/src/util/RichTextEdit.h +++ b/retroshare-gui/src/util/RichTextEdit.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RichTextEdit.h * + * retroshare-gui/src/util/RichTextEdit.h * * * * Copyright (c) 2019 Retroshare Team * * * diff --git a/retroshare-gui/src/util/RsAction.cpp b/retroshare-gui/src/util/RsAction.cpp index a0c38d492..acd3dae52 100644 --- a/retroshare-gui/src/util/RsAction.cpp +++ b/retroshare-gui/src/util/RsAction.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsAction.cpp * + * retroshare-gui/src/util/RsAction.cpp * * * * Copyright (c) 2007 DrBob * * * @@ -21,21 +21,21 @@ #include "util/RsAction.h" RsAction::RsAction(QObject * parent, std::string rsid) - : QAction(parent), RsId(rsid) + : QAction(parent), RsId(rsid) { connect(this, SIGNAL( triggered( bool ) ), this, SLOT( triggerEvent( bool ) ) ); } RsAction::RsAction(const QString & text, QObject * parent, std::string rsid) - : QAction(text, parent), RsId(rsid) + : QAction(text, parent), RsId(rsid) { connect(this, SIGNAL( triggered( bool ) ), this, SLOT( triggerEvent( bool ) ) ); } RsAction::RsAction(const QIcon & icon, const QString & text, QObject * parent , std::string rsid) - : QAction(icon, text, parent), RsId(rsid) + : QAction(icon, text, parent), RsId(rsid) { connect(this, SIGNAL( triggered( bool ) ), this, SLOT( triggerEvent( bool ) ) ); } diff --git a/retroshare-gui/src/util/RsAction.h b/retroshare-gui/src/util/RsAction.h index b2110428a..86201b506 100644 --- a/retroshare-gui/src/util/RsAction.h +++ b/retroshare-gui/src/util/RsAction.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsAction.h * + * retroshare-gui/src/util/RsAction.h * * * * Copyright (c) 2007 DrBob * * * diff --git a/retroshare-gui/src/util/RsFile.cpp b/retroshare-gui/src/util/RsFile.cpp index 26e9a5c55..f03437efb 100644 --- a/retroshare-gui/src/util/RsFile.cpp +++ b/retroshare-gui/src/util/RsFile.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsFile.cpp * + * retroshare-gui/src/util/RsFile.cpp * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/util/RsFile.h b/retroshare-gui/src/util/RsFile.h index cfffaa08f..e0996cc36 100644 --- a/retroshare-gui/src/util/RsFile.h +++ b/retroshare-gui/src/util/RsFile.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsFile.h * + * retroshare-gui/src/util/RsFile.h * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/util/RsGxsUpdateBroadcast.cpp b/retroshare-gui/src/util/RsGxsUpdateBroadcast.cpp index 906388cc2..e2707ffa8 100644 --- a/retroshare-gui/src/util/RsGxsUpdateBroadcast.cpp +++ b/retroshare-gui/src/util/RsGxsUpdateBroadcast.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsGxsUpdateBroadcast.cpp * + * retroshare-gui/src/util/RsGxsUpdateBroadcast.cpp * * * * Copyright (C) 2014-2020 Retroshare Team * * * diff --git a/retroshare-gui/src/util/RsGxsUpdateBroadcast.h b/retroshare-gui/src/util/RsGxsUpdateBroadcast.h index 1b700900d..ee3edee09 100644 --- a/retroshare-gui/src/util/RsGxsUpdateBroadcast.h +++ b/retroshare-gui/src/util/RsGxsUpdateBroadcast.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsGxsUpdateBroadcast.h * + * retroshare-gui/src/util/RsGxsUpdateBroadcast.h * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/util/RsNetUtil.cpp b/retroshare-gui/src/util/RsNetUtil.cpp index 3107d8b3f..73bec0bc4 100644 --- a/retroshare-gui/src/util/RsNetUtil.cpp +++ b/retroshare-gui/src/util/RsNetUtil.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsNetUtil.cpp * + * retroshare-gui/src/util/RsNetUtil.cpp * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/util/RsNetUtil.h b/retroshare-gui/src/util/RsNetUtil.h index 32dddde2a..db3324a0d 100644 --- a/retroshare-gui/src/util/RsNetUtil.h +++ b/retroshare-gui/src/util/RsNetUtil.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsNetUtil.h * + * retroshare-gui/src/util/RsNetUtil.h * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/util/RsProtectedTimer.cpp b/retroshare-gui/src/util/RsProtectedTimer.cpp index ec702f5ca..c7583fa49 100644 --- a/retroshare-gui/src/util/RsProtectedTimer.cpp +++ b/retroshare-gui/src/util/RsProtectedTimer.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsProtectedTimer.cpp * + * retroshare-gui/src/util/RsProtectedTimer.cpp * * * * Copyright (c) 2013 Cyril Soler * * * @@ -18,7 +18,7 @@ * * *******************************************************************************/ -#include +#include "retroshare-gui/RsAutoUpdatePage.h" #include #include "RsProtectedTimer.h" diff --git a/retroshare-gui/src/util/RsProtectedTimer.h b/retroshare-gui/src/util/RsProtectedTimer.h index 04d07f7b2..9627891e2 100644 --- a/retroshare-gui/src/util/RsProtectedTimer.h +++ b/retroshare-gui/src/util/RsProtectedTimer.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsProtectedTimer.h * + * retroshare-gui/src/util/RsProtectedTimer.h * * * * Copyright (c) 2013 Cyril Soler * * * diff --git a/retroshare-gui/src/util/RsQtVersion.cpp b/retroshare-gui/src/util/RsQtVersion.cpp index 0762e5510..3887dca51 100644 --- a/retroshare-gui/src/util/RsQtVersion.cpp +++ b/retroshare-gui/src/util/RsQtVersion.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsQtVersion.cpp * + * retroshare-gui/src/util/RsQtVersion.cpp * * * * Copyright (C) 2025 Retroshare Team * * * diff --git a/retroshare-gui/src/util/RsQtVersion.h b/retroshare-gui/src/util/RsQtVersion.h index e313f6054..9af3af0ae 100644 --- a/retroshare-gui/src/util/RsQtVersion.h +++ b/retroshare-gui/src/util/RsQtVersion.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsQtVersion.h * + * retroshare-gui/src/util/RsQtVersion.h * * * * Copyright (C) 2013 Retroshare Team * * * diff --git a/retroshare-gui/src/util/RsSyntaxHighlighter.cpp b/retroshare-gui/src/util/RsSyntaxHighlighter.cpp index 6a191ca2f..61cc94163 100644 --- a/retroshare-gui/src/util/RsSyntaxHighlighter.cpp +++ b/retroshare-gui/src/util/RsSyntaxHighlighter.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsSyntaxHighlighter.cpp * + * retroshare-gui/src/util/RsSyntaxHighlighter.cpp * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/util/RsSyntaxHighlighter.h b/retroshare-gui/src/util/RsSyntaxHighlighter.h index 4955401e4..573e7db73 100644 --- a/retroshare-gui/src/util/RsSyntaxHighlighter.h +++ b/retroshare-gui/src/util/RsSyntaxHighlighter.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsSyntaxHighlighter.h * + * retroshare-gui/src/util/RsSyntaxHighlighter.h * * * * Copyright (c) 2014 Retroshare Team * * * diff --git a/retroshare-gui/src/util/RsUserdata.h b/retroshare-gui/src/util/RsUserdata.h index 6ee3baa05..b96db497c 100644 --- a/retroshare-gui/src/util/RsUserdata.h +++ b/retroshare-gui/src/util/RsUserdata.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/RsUserdata.h * + * retroshare-gui/src/util/RsUserdata.h * * * * Copyright (C) 2013 Retroshare Team * * * diff --git a/retroshare-gui/src/util/TokenQueue.cpp b/retroshare-gui/src/util/TokenQueue.cpp index 4fad53fc5..431b07eaf 100644 --- a/retroshare-gui/src/util/TokenQueue.cpp +++ b/retroshare-gui/src/util/TokenQueue.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/TokenQueue.cpp * + * retroshare-gui/src/util/TokenQueue.cpp * * * * Copyright (c) 2012 Robert Fernie * * * diff --git a/retroshare-gui/src/util/TokenQueue.h b/retroshare-gui/src/util/TokenQueue.h index 0c163eca4..bc65467b9 100644 --- a/retroshare-gui/src/util/TokenQueue.h +++ b/retroshare-gui/src/util/TokenQueue.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/TokenQueue.h * + * retroshare-gui/src/util/TokenQueue.h * * * * Copyright (c) 2012 Robert Fernie * * Copyright (c) 2012 Christopher Evi-Parker * @@ -28,7 +28,7 @@ #include #include -#include +#include "retroshare/rstokenservice.h" #define COMPLETED_REQUEST 4 diff --git a/retroshare-gui/src/util/Widget.cpp b/retroshare-gui/src/util/Widget.cpp index cb9f6ad91..94e749d7c 100644 --- a/retroshare-gui/src/util/Widget.cpp +++ b/retroshare-gui/src/util/Widget.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/Widget.cpp * + * retroshare-gui/src/util/Widget.cpp * * * * Copyright (c) 2006 Crypton * * * diff --git a/retroshare-gui/src/util/Widget.h b/retroshare-gui/src/util/Widget.h index 5dc0b64b9..80c200385 100644 --- a/retroshare-gui/src/util/Widget.h +++ b/retroshare-gui/src/util/Widget.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/Widget.cpp * + * retroshare-gui/src/util/Widget.h * * * * Copyright (c) 2006 Crypton * * * @@ -32,7 +32,7 @@ class QDialog; /** * Helper functions for QWidget. * - * + * */ class Widget : NonCopyable { public: diff --git a/retroshare-gui/src/util/WidgetBackgroundImage.cpp b/retroshare-gui/src/util/WidgetBackgroundImage.cpp index e82e96c26..726a11adf 100644 --- a/retroshare-gui/src/util/WidgetBackgroundImage.cpp +++ b/retroshare-gui/src/util/WidgetBackgroundImage.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/WidgetBackgroundImage.cpp * + * retroshare-gui/src/util/WidgetBackgroundImage.cpp * * * * Copyright (c) 2006 Crypton * * * diff --git a/retroshare-gui/src/util/WidgetBackgroundImage.h b/retroshare-gui/src/util/WidgetBackgroundImage.h index 9790d9a80..36944f3e8 100644 --- a/retroshare-gui/src/util/WidgetBackgroundImage.h +++ b/retroshare-gui/src/util/WidgetBackgroundImage.h @@ -21,9 +21,9 @@ #ifndef WIDGETBACKGROUNDIMAGE_H #define WIDGETBACKGROUNDIMAGE_H -#include +#include "util/rsqtutildll.h" -#include +#include "util/NonCopyable.h" class QWidget; diff --git a/retroshare-gui/src/util/dllexport.h b/retroshare-gui/src/util/dllexport.h index 18283750d..083f0413a 100644 --- a/retroshare-gui/src/util/dllexport.h +++ b/retroshare-gui/src/util/dllexport.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/dllexport.h * + * retroshare-gui/src/util/dllexport.h * * * * Copyright (c) 2007 Crypton * * * @@ -17,11 +17,11 @@ * along with this program. If not, see . * * * *******************************************************************************/ - + #ifndef DLLEXPORT_H #define DLLEXPORT_H -#include +#include "util/global.h" /** * @file dllexport.h @@ -50,7 +50,7 @@ * GCC > v4.0 support library visibility attributes. * * @see http://gcc.gnu.org/wiki/Visibility - * + * */ //Shared library support #ifdef OS_WIN32 diff --git a/retroshare-gui/src/util/framecatcher.cpp b/retroshare-gui/src/util/framecatcher.cpp index 1fd30e5ab..280daf363 100644 --- a/retroshare-gui/src/util/framecatcher.cpp +++ b/retroshare-gui/src/util/framecatcher.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/framecatcher.cpp * + * retroshare-gui/src/util/framecatcher.cpp * * * * Copyright (c) 2006 Raul E. * * Copyright (c) 2010 Chris Evi-Parker * @@ -247,7 +247,7 @@ unsigned char * framecatcher::yv12ToRgb (uint8_t *src_y, uint8_t *src_u, uint8_t rgb = new unsigned char[(width * height * 4)]; //qt needs a 32bit align if (!rgb) //qDebug ("Not enough memory!"); return NULL; - + for (i = 0; i < height; ++i){ /* diff --git a/retroshare-gui/src/util/framecatcher.h b/retroshare-gui/src/util/framecatcher.h index 57c9f5c55..3b5744201 100644 --- a/retroshare-gui/src/util/framecatcher.h +++ b/retroshare-gui/src/util/framecatcher.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/framecatcher.h * + * retroshare-gui/src/util/framecatcher.h * * * * Copyright (c) 2006 Raul E. * * Copyright (c) 2010 Chris Evi-Parker * diff --git a/retroshare-gui/src/util/global.h b/retroshare-gui/src/util/global.h index a9a447a3b..8338a5d2b 100644 --- a/retroshare-gui/src/util/global.h +++ b/retroshare-gui/src/util/global.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/global.h * + * retroshare-gui/src/util/global.h * * * * Copyright (c) 2007 Crypton * * * @@ -64,7 +64,7 @@ * * @file global.h * @see qglobal.h from Qt4 - * + * */ //OS diff --git a/retroshare-gui/src/util/imageutil.cpp b/retroshare-gui/src/util/imageutil.cpp index 472ea2369..2b0db60eb 100644 --- a/retroshare-gui/src/util/imageutil.cpp +++ b/retroshare-gui/src/util/imageutil.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/imageutil.cpp * + * retroshare-gui/src/util/imageutil.cpp * * * * Copyright (c) 2010 Retroshare Team * * * diff --git a/retroshare-gui/src/util/imageutil.h b/retroshare-gui/src/util/imageutil.h index 46e83e728..e7a48f2fd 100644 --- a/retroshare-gui/src/util/imageutil.h +++ b/retroshare-gui/src/util/imageutil.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/imageutil.h * + * retroshare-gui/src/util/imageutil.h * * * * Copyright (c) 2010 Retroshare Team * * * diff --git a/retroshare-gui/src/util/log.cpp b/retroshare-gui/src/util/log.cpp index 23efb329c..c36bd3aa4 100644 --- a/retroshare-gui/src/util/log.cpp +++ b/retroshare-gui/src/util/log.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/log.h * + * retroshare-gui/src/util/log.cpp * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * @@ -47,7 +47,7 @@ Log::~Log() QStringList Log::logLevels() { - return (QStringList() << "debug" << "info" << "notice" + return (QStringList() << "debug" << "info" << "notice" << "warn" << "error"); } diff --git a/retroshare-gui/src/util/log.h b/retroshare-gui/src/util/log.h index 035848c61..0c4ba358c 100644 --- a/retroshare-gui/src/util/log.h +++ b/retroshare-gui/src/util/log.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/log.h * + * retroshare-gui/src/util/log.h * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * @@ -18,7 +18,7 @@ * along with this program. If not, see . * * * *******************************************************************************/ - + #ifndef _LOG_H #define _LOG_H @@ -31,7 +31,7 @@ /** The Log class is similar to the QDebug class provided with Qt, but with * finer-grained logging levels, slightly different output (for example, not - * everything is wrapped in double quotes), supports using .arg(), and can + * everything is wrapped in double quotes), supports using .arg(), and can * still be used even if Qt was compiled with QT_NO_DEBUG_STREAM. */ class Log { @@ -47,7 +47,7 @@ public: Unknown /**< Unknown/invalid log level. */ }; class LogMessage; - + /** Default constructor. */ Log(); /** Destructor. */ @@ -58,13 +58,13 @@ public: bool open(FILE *file); /** Opens a file on disk to which log messages will be written. */ bool open(QString file); - /** Closes the log file. */ + /** Closes the log file. */ void close(); /** Returns true if the log file is open and ready for writing. */ bool isOpen() { return _logFile.isOpen() && _logFile.isWritable(); } /** Returns a string description of the last file error encountered. */ QString errorString() { return _logFile.errorString(); } - + /** Sets the current log level to level. */ void setLogLevel(LogLevel level); /** Returns a list of strings representing valid log levels. */ @@ -73,7 +73,7 @@ public: static inline QString logLevelToString(LogLevel level); /** Returns a LogLevel for the level given by str. */ static LogLevel stringToLogLevel(QString str); - + /** Creates a log message with severity level and initial message * contents message. The log message can be appended to until the * returned LogMessage's destructor is called, at which point the complete @@ -83,36 +83,36 @@ public: * appended to until the returned LogMessage's destructor is called, at * which point the complete message is written to the log file. */ inline LogMessage log(LogLevel level); - + private: LogLevel _logLevel; /**< Minimum log severity level. */ QFile _logFile; /**< Log output destination. */ }; -/** This internal class represents a single message that is to be written to +/** This internal class represents a single message that is to be written to * the log destination. The message is buffered until it is written to the * log in this class's destructor. */ class Log::LogMessage { public: struct Stream { - Stream(Log::LogLevel t, QIODevice *o) + Stream(Log::LogLevel t, QIODevice *o) : type(t), out(o), ref(1) {} Log::LogLevel type; QIODevice *out; int ref; QString buf; } *stream; - + inline LogMessage(Log::LogLevel t, QIODevice *o) : stream(new Stream(t,o)) {} - inline LogMessage(const LogMessage &o) + inline LogMessage(const LogMessage &o) : stream(o.stream) { ++stream->ref; } inline QString toString() const; ~LogMessage(); - + /* Support both the << and .arg() methods */ - inline LogMessage &operator<<(const QString &t) + inline LogMessage &operator<<(const QString &t) { stream->buf += t; return *this; } inline LogMessage arg(const QString &a) { stream->buf = stream->buf.arg(a); return *this; } diff --git a/retroshare-gui/src/util/misc.cpp b/retroshare-gui/src/util/misc.cpp index 6ab427d10..2dc00ca14 100644 --- a/retroshare-gui/src/util/misc.cpp +++ b/retroshare-gui/src/util/misc.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/misc.cpp * + * retroshare-gui/src/util/misc.cpp * * * * Copyright (c) 2008, defnax * * Copyright (C) 2006 Christophe Dumez * diff --git a/retroshare-gui/src/util/misc.h b/retroshare-gui/src/util/misc.h index 2863a867c..78d7ec842 100644 --- a/retroshare-gui/src/util/misc.h +++ b/retroshare-gui/src/util/misc.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/misc.h * + * retroshare-gui/src/util/misc.h * * * * Copyright (c) 2008, defnax * * Copyright (C) 2006 Christophe Dumez * @@ -88,7 +88,7 @@ class misc : public QObject // } // return x; // } -// +// // template static T fromQByteArray(const QByteArray& s) { // T x; // std::istringstream i((const char*)s); diff --git a/retroshare-gui/src/util/printpreview.cpp b/retroshare-gui/src/util/printpreview.cpp index 4bf4ad7c4..44af37a7d 100644 --- a/retroshare-gui/src/util/printpreview.cpp +++ b/retroshare-gui/src/util/printpreview.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/printpreview.cpp * + * retroshare-gui/src/util/printpreview.cpp * * * * Copyright (C) 2004-2007 Trolltech ASA. All rights reserved. * * * diff --git a/retroshare-gui/src/util/printpreview.h b/retroshare-gui/src/util/printpreview.h index 24f573187..b6b763567 100644 --- a/retroshare-gui/src/util/printpreview.h +++ b/retroshare-gui/src/util/printpreview.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/printpreview.h * + * retroshare-gui/src/util/printpreview.h * * * * Copyright (C) 2004-2007 Trolltech ASA. All rights reserved. * * * diff --git a/retroshare-gui/src/util/qtthreadsutils.h b/retroshare-gui/src/util/qtthreadsutils.h index 1c377b35d..1706566ab 100644 --- a/retroshare-gui/src/util/qtthreadsutils.h +++ b/retroshare-gui/src/util/qtthreadsutils.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/qthreadutils.h * + * retroshare-gui/src/util/qthreadutils.h * * * * Copyright (C) 2018-2020 Gioacchino Mazzurco * * * diff --git a/retroshare-gui/src/util/retroshareWin32.cpp b/retroshare-gui/src/util/retroshareWin32.cpp index 5693ef514..e2152afa5 100644 --- a/retroshare-gui/src/util/retroshareWin32.cpp +++ b/retroshare-gui/src/util/retroshareWin32.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/retroshareWin32.cpp * + * retroshare-gui/src/util/retroshareWin32.cpp * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * @@ -63,7 +63,7 @@ win32_get_folder_location(int /*folder*/, QString defaultPath) return defaultPath; } -/** Returns the value in keyName at keyLocation. +/** Returns the value in keyName at keyLocation. * Returns an empty QString if the keyName doesn't exist */ QString win32_registry_get_key_value(QString keyLocation, QString keyName) @@ -75,11 +75,11 @@ win32_registry_get_key_value(QString keyLocation, QString keyName) /* Open the key for reading (opens new key if it doesn't exist) */ if (RegOpenKeyExA(HKEY_CURRENT_USER, - qPrintable(keyLocation), + qPrintable(keyLocation), 0L, KEY_READ, &key) == ERROR_SUCCESS) { - + /* Key exists, so read the value into data */ - RegQueryValueExA(key, qPrintable(keyName), + RegQueryValueExA(key, qPrintable(keyName), NULL, NULL, (LPBYTE)data, &size); } @@ -101,7 +101,7 @@ win32_registry_set_key_value(QString keyLocation, QString keyName, QString keyVa { #ifdef WIN32 HKEY key; - + /* Open the key for writing (opens new key if it doesn't exist */ if (RegOpenKeyExA(HKEY_CURRENT_USER, qPrintable(keyLocation), @@ -115,7 +115,7 @@ win32_registry_set_key_value(QString keyLocation, QString keyName, QString keyVa } /* Save the value in the key */ - RegSetValueExA(key, qPrintable(keyName), 0, REG_SZ, + RegSetValueExA(key, qPrintable(keyName), 0, REG_SZ, (BYTE *)qPrintable(keyValue), (DWORD)keyValue.length() + 1); // include null terminator @@ -134,12 +134,12 @@ win32_registry_remove_key(QString keyLocation, QString keyName) { #ifdef WIN32 HKEY key; - + /* Open the key for writing (opens new key if it doesn't exist */ if (RegOpenKeyExA(HKEY_CURRENT_USER, qPrintable(keyLocation), 0, KEY_SET_VALUE, &key) == ERROR_SUCCESS) { - + /* Key exists so delete it */ RegDeleteValueA(key, qPrintable(keyName)); } @@ -158,9 +158,9 @@ win32_program_files_folder() { return win32_get_folder_location( #if 0 - CSIDL_PROGRAM_FILES, + CSIDL_PROGRAM_FILES, #else - 0, + 0, #endif QDir::rootPath() + "\\Program Files"); } @@ -171,9 +171,9 @@ win32_app_data_folder() { return win32_get_folder_location( #if 0 - CSIDL_APPDATA, + CSIDL_APPDATA, #else - 0, + 0, #endif QDir::homePath() + "\\Application Data"); diff --git a/retroshare-gui/src/util/retroshareWin32.h b/retroshare-gui/src/util/retroshareWin32.h index 5027af3be..6c51536de 100644 --- a/retroshare-gui/src/util/retroshareWin32.h +++ b/retroshare-gui/src/util/retroshareWin32.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/retroshareWin32.h * + * retroshare-gui/src/util/retroshareWin32.h * * * * Copyright (c) 2006-2007, crypton * * Copyright (c) 2006, Matt Edman, Justin Hipple * diff --git a/retroshare-gui/src/util/rsqtutildll.h b/retroshare-gui/src/util/rsqtutildll.h index 341b8f77d..9244ec838 100644 --- a/retroshare-gui/src/util/rsqtutildll.h +++ b/retroshare-gui/src/util/rsqtutildll.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/rsqtutidll.h * + * retroshare-gui/src/util/rsqtutidll.h * * * * Copyright (c) 2006 Crypton * * * @@ -21,7 +21,7 @@ #ifndef RSQTUTILDLL_H #define RSQTUTILDLL_H -#include +#include "util/dllexport.h" #ifdef RSQTUTIL_DLL #ifdef BUILD_RSQTUTIL_DLL diff --git a/retroshare-gui/src/util/rsutildll.h b/retroshare-gui/src/util/rsutildll.h index c4f95d461..73ecb5f5f 100644 --- a/retroshare-gui/src/util/rsutildll.h +++ b/retroshare-gui/src/util/rsutildll.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/rsutildll.h * + * retroshare-gui/src/util/rsutildll.h * * * * Copyright (c) 2006 Crypton * * * @@ -17,11 +17,11 @@ * along with this program. If not, see . * * * *******************************************************************************/ - + #ifndef RSUTILDLL_H #define RSUTILDLL_H -#include +#include "util/dllexport.h" #ifdef RSUTIL_DLL #ifdef BUILD_RSUTIL_DLL diff --git a/retroshare-gui/src/util/stringutil.cpp b/retroshare-gui/src/util/stringutil.cpp index 9082bde20..9fde4f85a 100644 --- a/retroshare-gui/src/util/stringutil.cpp +++ b/retroshare-gui/src/util/stringutil.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * util/stringutil.cpp * + * retroshare-gui/src/util/stringutil.cpp * * * * Copyright (c) 2008, crypton * * Copyright (c) 2008, Matt Edman, Justin Hipple * @@ -105,12 +105,12 @@ string_wrap(const QString &str, int width, QString wrapped; int pos, nextsep, wordlen, n; int seplen = sep.length(); - + if (str.length() < width) { return str; } - pos = 0; + pos = 0; n = width; while (pos < str.length()) { /* Get the length of a "word" */ @@ -171,7 +171,7 @@ QString string_unescape(const QString &str, bool *ok) { QString out; - + /* The string must start and end with an unescaped dquote */ if (str.length() < 2 || !str.startsWith("\"") || !str.endsWith("\"") || (str.endsWith("\\\"") && !str.endsWith("\\\\\""))) { @@ -198,17 +198,17 @@ string_parse_keyvals(const QString &str, bool *ok) int i, len; bool tmp_ok; QHash keyvals; - + i = 0; len = str.length(); while (i < len && str[i].isSpace()) i++; /* Skip initial whitespace */ while (i < len) { QString key, val; - + while (i < len && !str[i].isSpace() && str[i] != '=') key.append(str[i++]); - + if (i < len && str[i] == '=') { if (++i < len && str[i] == '\"') { /* The value is wrapped in quotes */ @@ -222,7 +222,7 @@ string_parse_keyvals(const QString &str, bool *ok) } else if (str[i] == '\"') { i++; break; - } + } } val = string_unescape(val, &tmp_ok); if (!tmp_ok) @@ -266,7 +266,7 @@ string_parse_arguments(const QString &str, bool *ok) i++; /* Skip initial whitespace */ while (i < len) { QString arg; - + if (str[i] == '\"') { /* The value is wrapped in quotes */ arg.append(str[i]); @@ -279,7 +279,7 @@ string_parse_arguments(const QString &str, bool *ok) } else if (str[i] == '\"') { i++; break; - } + } } arg = string_unescape(arg, &tmp_ok); if (!tmp_ok) @@ -315,7 +315,7 @@ string_format_arguments(const QStringList &args) foreach (QString arg, args) { if (arg.contains("\"") || arg.contains("\\") || arg.contains(" ")) out << string_escape(arg); - else + else out << arg; } return out.join(" "); diff --git a/retroshare-gui/src/util/stringutil.h b/retroshare-gui/src/util/stringutil.h index c8f0640f7..d5e79d25e 100644 --- a/retroshare-gui/src/util/stringutil.h +++ b/retroshare-gui/src/util/stringutil.h @@ -1,5 +1,5 @@ /******************************************************************************* - * util/stringutil.h * + * retroshare-gui/src/util/stringutil.h * * * * Copyright (c) 2008, crypton * * Copyright (c) 2008, Matt Edman, Justin Hipple * @@ -50,7 +50,7 @@ bool err(QString *str, const QString &errmsg); /** Wraps str at width characters wide, using sep as the * word separator (" ", for example), and placing the line ending le at * the end of each line, except the last.*/ -QString string_wrap(const QString &str, int width, +QString string_wrap(const QString &str, int width, const QString &sep, const QString &le); /** Encodes the bytes in buf as an uppercase hexadecimal string and