Skip to content

Commit

Permalink
Merge remote-tracking branch #494 (VENOM-494) into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@naxuroqa
naxuroqa committed Feb 9, 2019
2 parents e2d9fe4 + 52a4a66 commit f5dd584
Show file tree
Hide file tree
Showing 7 changed files with 349 additions and 200 deletions.
32 changes: 1 addition & 31 deletions src/ui/contact_list_widget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,39 +233,9 @@ along with Venom. If not, see <http://www.gnu.org/licenses/>.
<object class="GtkBox" id="placeholder">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">end</property>
<property name="margin_left">12</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">pan-down-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Add a friend</property>
<property name="ellipsize">end</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
<placeholder/>
</child>
<style>
<class name="dim-label"/>
<class name="highlight"/>
</style>
</object>
<object class="GtkPopover" id="popover1">
<property name="can_focus">False</property>
Expand Down
31 changes: 29 additions & 2 deletions src/ui/custom.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,37 @@
box-shadow: inset 0 -3px @borders;
}

.conversation row {
.message {
background: @theme_bg_color;
border: 6px solid @theme_bg_color;
border-radius: 6px;
}

.message-arrow {
margin-top: 6px;
border-top: 6px solid transparent;
border-bottom: 6px solid transparent;
border-right: 6px solid @theme_bg_color;
}

.message-arrow {
margin-top: 6px;
border-top: 6px solid transparent;
border-bottom: 6px solid transparent;
border-right: 6px solid @theme_bg_color;
}

.message-arrow-outgoing {
margin-top: 6px;
border-top: 6px solid transparent;
border-bottom: 6px solid transparent;
border-left: 6px solid @theme_bg_color;
}

/* .conversation row {
box-shadow: 0px 1px 2px 1px alpha(black, 0.2);
margin: 1px 6px 3px 6px;
}
} */

.separated row {
border-bottom: 1px solid @theme_bg_color;
Expand Down
151 changes: 95 additions & 56 deletions src/ui/message_widget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,76 @@ along with Venom. If not, see <http://www.gnu.org/licenses/>.
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="sender_image">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="pixel_size">20</property>
<property name="icon_name">user-info-symbolic</property>
<property name="icon_size">6</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="sender_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="pixel_size">20</property>
<property name="icon_name">user-info-symbolic</property>
<property name="icon_size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="sender">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">sender</property>
<property name="use_markup">True</property>
<property name="ellipsize">end</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="timestamp">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">timestamp</property>
<property name="ellipsize">start</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkImage" id="sent">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="icon_name">emblem-ok-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
Expand All @@ -51,86 +112,64 @@ along with Venom. If not, see <http://www.gnu.org/licenses/>.
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<placeholder/>
</child>
<child>
<object class="GtkBox" id="arrow_incoming">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="sender">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">sender</property>
<property name="use_markup">True</property>
<property name="ellipsize">end</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<property name="valign">start</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="timestamp">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">timestamp</property>
<property name="ellipsize">start</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkImage" id="sent">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="icon_name">emblem-ok-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="message">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label">message</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="wrap_mode">word-char</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="message"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkBox" id="arrow_outgoing">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
Expand Down
Loading

0 comments on commit f5dd584

Please sign in to comment.